Make sure that all locks cover an entire function.

[rec]

https://ramcloud.stanford.edu/wiki/display/ramcloud/Software+Design+Philosophy

Might be more work than I care to undertake at this time, for small rewards, but as a reminder...