Two different "delete surrounding function" mappings
Simpler "surround with function call"

Experimental, let's see if I find this more comfortable
Don't use Ag. Again.

Extremely slow for its first run, probably because it's mmap-ing all the
files?