fixing refactored-out opcode_annotators