Likely fix a bunch of Coverity warnings.

This is a very crazy lock/unlock pattern... an extra assignment
makes it easier to follow the logic.