Mostly whitespace tweaks.