Applied similar fixes to BCF2FieldEncoder.toList