Merge in xdiff cleanup pieces