move call handling in handleEndBlock up a bit, and simplify it.