Remove use of 'base as op2'