Remove reliance on operations defining their opcodes as it can cause conflicts