Misc code style cleanup.