Remy Maucherat
committed
on 16 Oct 13
Some cleanups.