Finish moving NXM into nx-match.  Tests pass.