Changed M2_ASSERT's that don't compile...