Refine handling of operator symbols