Introduce pathogen#surround()
Actually try things before you commit