CDK-496: Fixed bug in CSVInputFormat and additional minor nits.