Whitespace cleanup and minor fixes ("" for -z arguments, using -ne when
comparing numbers, etc).

And no, you may not like this white-space style either, but at least the
file now is consistent. Having to read several different styles in one
file was getting on my nerves ;-)

--HG--
extra : convert_revision : 5ea2f901165d5c92f63eb834bb2d8ff167f20384