More gratuitous whitespace changes.

Should be mostly done now.