Make NewFile2 take variable leafBlockSize to:

Allow it's reuse to extract hashes of inter nodes.