Fix problems with the IXFR state machine which caused long diffs to
fail.  Thanks to James Raftery for the fix and the repeated prodding
to get it applied :)