Revise to eliminate ambiguity warnings related to op keyword