Further simplifications; regexMatcher is now unneeded