[CSV] Address @zuphilip's comments for 4e2a7353fa5224199807090d54e7f4cbfd720030
Re #742