Misc style fixes. NFC.

This just reduces the noise in the next patch.