Matcher refactored.