Refactor matching code

Josh: I also have an idea for a refactor of the core matching code that I think can leverage an additional simple, ahead-of-time checkable, probably always true assumption about residue definitions to do name based matching in a single, simpler, more robust pass, and re-use code from the additional_definitions path. So would be good to talk about that at some point!
