More emacs temp cleanups.