Code review comment for lp:~soren/nova/consolidate-locking

This looks really good-- great work Soren.

Brownie points for:

* Useful inline comments
* Added test
* YAGNI on the added complexity of a race-free sync (think it was probably wise to punt on that for now)