gh-183: review fixes. Use a RAII class for scoped guard.

Remove an extra block offset.