A little .emacs cruft cleanup