Replace all anonymous implementations of FeatureMatcher with call to factory method given an extractor function.