Lots of trivial style cleanups.