* Mostly whitespace fixes pointed out by Ivo Anjo.