Large-scale changeover to use COMBINE instead of REJOIN