More VCF header work and filter cleanup