Factor out arity checking code

[dgopstein]

Maybe something like:

dispatch_block(block, key, value)

that calls block.call(key, value) or block.call(value) as appropriate