Emacs config refactorings