Complete diff of my proposed change.

If anyone has time to test this it would be appreciated, as I saw some
strange (and now unrepeatable) failures with an earlier version of this.
I've not I'll install it tomorrow, as it seems functional in my hands.