Eliminate duplicate conditions in RexProgramBuilder.addCondition, not RexBuilder.makeCall as previously.