>>>>> James Thomas writes:

    > Meanwhile, I think it would be better if you could post the entire
    > patchset here so that others may test it easily.

Attached.  (with all commits squashed into the first)