Remove short-circuiting operators.