More robust Emacs commands