Refactor operator overloads to canonical form.