Reduce the scope of some locks