Convert M() and M2() macros to honor their second, mp, parameter.

No match.