Polishing up VCF parser