Cleanup whitespace.
Merge pull request #9840 from jbrown/cleanup-whitespace

Cleanup whitespace.