Simplify locking semantics some more to address a deadlock.