Fix a few style errors while there.

(cherry picked from commit 63a0231e)
(cherry picked from commit a10382ca)
(cherry picked from commit 79863b19)