Clean up some stuff so Emacs 24 loads cleaner