Rewrite the Shift+Escape code a bit (somewhat cleaner)