Tweak template-matching Regexp