added more DEFINE_OPCODE_HANDLER macro usage