MappingVocabularyRepair made generic.