Move yet more folds over to the dag combiner from sd.cpp