I thought this addition to genmatch was going to be much harder. But it turns out not to be so bad. Still need to add some error checking; into the generated code too.