Big whitespace changes.

As I think I'll likely be the one maintaining this code in the long run,
just go ahead and make the whitespace sane.