Minor style cleanups.