Thanks, that's perfect. I still have a running emacs instance for magit, and editing elisp at least, so I can still make use of your suggestion. (I made it so that C-g with prefix arg calls top-level; not sure if you'll think that UI makes sense).