Whitespace fixes.

Some assorted, minor WS fixes noticed by QC here.