Eliminate some calls to op.Extract