Remove or rename ambiguous operators
Test sections