Fix substitutions - no longer escape the regular expression we're searching for.