Another round of dag combiner changes. This fixes some missing XOR folds