More data generator cleanup.