Summary: The locking scheme has been re-architected, the code slightly refactored.
Reviewed-by: art, dcherepanov