CSV-to-GF: small improvements