Fixed infinite loop for expressions of the form (x*C + y%C) + z%C.