Now using parseCSVRow() where appropriate

Change-Id: Ic3b0349cfcdbea806abced431eb2d10a0043eafd