Starting to rewrite MerkleBranch handling