Misc style fixes.