Format fixes.

This fixes the items Flibitijibibo noted, and a couple of whitespacing issues
that MonoDevelop slipped into the code.