Minor: use of locks should be explicit and easy to read.