tweaking AnnotationMatcher implementation