I merged in my changes to opcode_handler.