The local_lock merge made rather a mess of all of this. I'm cooking up a full resend of the same material.
