Fix op2 references that had not yet been converted; introduce opy