Mostly emacs changes.