A bit more data generation cleanup