Turn locking stateless

This model for locking doesn't require any ordering of locked keys. It may or may not be better UX, but it makes the code a little better.

See commit message.