Cleaning up some of the use-package stuff.
More cleanup and reorganizing.