xdiff/xhistogram: rework handling of recursed results