EZP-20305: Removed matcher cloning
EZP-20305: Simplified reverse map building in Map matchers