No code changes, but lots of trivial whitespace cleaning, and
removal of a bogus set of 'defaults' at the bottom of the file.