Remove the commutativity checking (and so on) from the macro.