OK, I finished the template parameterization of the hash function, and the updates to test expectations.
Moving on to creating performance test simulations of confirmation using cache data so that inputs/outputs are never queried except as cache misses. This reduces the read order for confirmation to tx/block level, vs. input/tx/block (10^8/10^6 vs. 10^9/10^8/10^6).