General style cleanups.