Switched CSV output functions to the proper, up-to-date code