Matcher: minor refactoring