xdiff: minor changes to match libxdiff-0.21