Update old surround functions to ignore mappings

and not beep at me because of too many Esc's