Reorder operands to be consistent and match proof