Get the opnum restructured correctly