DRILL-1695: Fix code generator comparisons