Whitespace tweaks and cleanup.