Emacs: Yes, surround has been renamed