Now each lock has an easily understandable purpose, and covers the
lowest possible amount of code.