Canonicalization tweak and added overflow operators.