Clean up a few nits before starting.

Sorry about the whitespace changes.