Moved logic to determine whether to use 'csv' or 'csv-with-metadata-plugin' output format to somewhere more appropriate.