Whitespace and capitalization cleanups.
(cherry picked from commit c82df0a0bf28725b974b1805740a754cfc3961e1)