> It's a side-effect from my refactoring of the MapMapping test (to avoid ambiguities)

Hum, I'm wondering which ambiguities you came across. When I run `MapMappingTest` in the original form with your changes in the matching code, the test still passes. From a quick view I also can't find any suspicuous methods, so I'm tempted to leave the map mapping test as is. WDYT?