Surround whitespace bug

Fix for a typo in the surround helper causing a bug where whitespace would not be stripped and 's' characters would