Coding style fixes to previous commit.