Remove short-circuit in comparison code in codegen