Fix the counting mockup to be a little smarter.

Still need to figure out what to do about values that
straddle block boundaries.