minor opcode cleanup