emacs: Various cosmetic changes