Change the return protocol from pre blocks to return a hash with args/block.