Fixes for generating prefetchable queries in the FixedTPCCEstimator.