Adding CSVHelper changes to a few more Generate* files