Minor code style cleanups.