Refactor checkpoint chunk and block offsetting.

This makes the offsetting a lot cleaner and fixes a couple of mistakes.

This should perhaps be refactored to not use the offsets.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>