Clean up the regexps