emacs: refactoring again.