Fix some whitespace I missed in rev. 1.2, and fix the whitespace from
the previous commit (rev 1.3). This commit is whitespace changes only.