Make operator symbols a bit more consistent
Regression fix: Operator mismatch was possible due to the bad order