Trying to clean up the Matcher API.