I refactored this to use the existing matcher.