Coding style cleanups.