Blender Git Loki

Cleanup: Always keep unlock at same level as lock.

This was fine in those cases with current code, but that kind of
assumption is always risky, and an open door to hard-to-track bugs when
code changes in the future...