Formatting cleanup in preparation for active work. Might as well get the diff-killing out of the way now, rather than distributing it throughout the history.

Author: tabatkins