HOPKINS: Rework two opcodes