Lots of little cleanups.