Rewritten many opcodes into macro ops for clarity