Fix style problems that weren't merged successfully in the rebase.