Make matcher return Match() instances

Provide __iter__ so they magically work like tuples until I fix
everywhere it's used.
Make OriginView able to delete ambiguous matches
Correct origins in new scheming.json