More cleanup.
Cleanup of NSRegularExpressionTemplateMatcher.