I'm going to put out a patch to optionally clean up that lock today.