What could possibly go wrong?

Simplification of the locking code?