unpack_trees(): fix diff-index regression.