Fix M(), M2() macros in VAT