DemiMaker produces non duplicate Matchers

Regression tests run, but there are lots of failures. I think we are
going to need fuzzy matching after all.