Minor emacs variable cleanup.