Small code rearrangement in TableDataGenerator