A whole bunch of style cleanups.