Yet more emacs init cleanup.