Next round of DAGCombiner changes. This version now passes all the tests