emacs: refactoring again on Mac OS X.