Coding standards fixups.