Remove two locks
Remove two locks

In two places (including teardown) we require the read lock just to get
the current offset -- which we were just twiddling in the function we
just called. Now that function returns the offset and we can immediately
just use it.

zorkian/marshal