diff --git a/data/schemata/bcf.rnc b/data/schemata/bcf.rnc
index 02cd083da..8c943793f 100644
--- a/data/schemata/bcf.rnc
+++ b/data/schemata/bcf.rnc
@@ -54,7 +54,7 @@ start =
       singletitle,
       skipbib,
       skipbiblist,
-      skiplab,
+      skiplab,      
       sortalphaothers?,
       sortlocale,
       sortingtemplatename,
@@ -68,7 +68,7 @@ start =
       useprefix,
       usenames
     },
-
+    
     # Per-entrytype BibLaTeX options
     element bcf:options {
       attribute component { "biblatex" },
@@ -127,7 +127,7 @@ start =
       xsd:string
       }+
     }*,
-
+    
     # datafield sets
     element bcf:datafieldset {
       attribute name { text },
@@ -162,13 +162,13 @@ start =
         text
       }+
     }+,
-
+    
     # labelalpha template specification
     element bcf:labelalphatemplate {
       attribute type { xsd:string }?, # per-type?
       element bcf:labelelement {
         attribute order { xsd:integer },
-        element bcf:labelpart {
+        element bcf:labelpart {          
           attribute final { xsd:boolean }?,
           attribute pad_char { xsd:string {minLength="1"}}?,
           attribute pad_side { "left" | "right" }?,
@@ -187,7 +187,6 @@ start =
 
     # Extradate specification
     element bcf:extradatespec {
-      attribute type { xsd:string }?, # per-type?
       # Scope of extradate tracking - an ordered set of fields to try
       element bcf:scope {
         # A field used to track extradate
@@ -196,7 +195,7 @@ start =
           text
         }+
       }+
-    }+,
+    },
 
     # Cross-reference inheritance specifications
     element bcf:inheritance {
@@ -846,7 +845,7 @@ wrapline =
     attribute type { "singlevalued" },
     element bcf:key { "wrapline" },
     element bcf:value { xsd:integer }
-  }
+  }  
 output_encoding =
   element bcf:option {
     attribute type { "singlevalued" },
diff --git a/data/schemata/bcf.rng b/data/schemata/bcf.rng
index 1738cbe78..fbe72d016 100644
--- a/data/schemata/bcf.rng
+++ b/data/schemata/bcf.rng
@@ -447,33 +447,23 @@
           </oneOrMore>
         </element>
       </oneOrMore>
-      <oneOrMore>
-        <!-- Extradate specification -->
-        <element name="bcf:extradatespec">
-          <optional>
-            <attribute name="type">
-              <data type="string"/>
-            </attribute>
-          </optional>
-          <oneOrMore>
-            <!--
-              per-type?
-              Scope of extradate tracking - an ordered set of fields to try
-            -->
-            <element name="bcf:scope">
-              <oneOrMore>
-                <!-- A field used to track extradate -->
-                <element name="bcf:field">
-                  <attribute name="order">
-                    <data type="integer"/>
-                  </attribute>
-                  <text/>
-                </element>
-              </oneOrMore>
-            </element>
-          </oneOrMore>
-        </element>
-      </oneOrMore>
+      <!-- Extradate specification -->
+      <element name="bcf:extradatespec">
+        <oneOrMore>
+          <!-- Scope of extradate tracking - an ordered set of fields to try -->
+          <element name="bcf:scope">
+            <oneOrMore>
+              <!-- A field used to track extradate -->
+              <element name="bcf:field">
+                <attribute name="order">
+                  <data type="integer"/>
+                </attribute>
+                <text/>
+              </element>
+            </oneOrMore>
+          </element>
+        </oneOrMore>
+      </element>
       <!-- Cross-reference inheritance specifications -->
       <element name="bcf:inheritance">
         <!-- Defaults -->
diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc
index f6c6fa2fb..1a6b7fef2 100644
--- a/data/schemata/config.rnc
+++ b/data/schemata/config.rnc
@@ -34,11 +34,11 @@ start =
         empty
       }+
     }* &
-
+           
     # Annotation marker
     element annotation_marker { text }? &
     # Can't specify the config file location in the config file ...
-    # element configfile          { text }? &
+    # element configfile          { text }? & 
     element convert_control     { "0" | "1" }? &
     element dot_include         { text }? &
     # Data model specification (mainly for tool mode)
@@ -380,7 +380,7 @@ map =
   }
 
 
-labelalphanametemplate =
+labelalphanametemplate =     
     element labelalphanametemplate {
       attribute name { xsd:string }?,
       element namepart {
@@ -393,13 +393,13 @@ labelalphanametemplate =
         text
       }+
     }
-
-labelalphatemplate =
+    
+labelalphatemplate =         
     element labelalphatemplate {
       attribute type { xsd:string }?, # per-type?
       element labelelement {
         attribute order { xsd:integer },
-        element labelpart {
+        element labelpart {          
           attribute final { "0" | "1" }?,
           attribute pad_char { xsd:string {minLength="1"}}?,
           attribute pad_side { "left" | "right" }?,
@@ -417,7 +417,7 @@ labelalphatemplate =
     }
 
 
-uniquenametemplate =
+uniquenametemplate = 
   element uniquenametemplate {
     attribute name { xsd:string {minLength="1"} },
     element namepart {
@@ -429,7 +429,7 @@ uniquenametemplate =
     }+
   }
 
-namehashtemplate =
+namehashtemplate = 
   element namehashtemplate {
     attribute name { xsd:string {minLength="1"} },
     element namepart {
@@ -439,7 +439,7 @@ namehashtemplate =
     }+
   }
 
-sortingnamekeytemplate =
+sortingnamekeytemplate = 
   element sortingnamekeytemplate {
     attribute name { text },
     attribute visibility { text },
@@ -455,7 +455,7 @@ sortingnamekeytemplate =
     }+
   }
 
-sortingtemplate =
+sortingtemplate = 
   element sortingtemplate {
     # sorting template name
     attribute name { xsd:string {minLength="1"}},
diff --git a/lib/Biber.pm b/lib/Biber.pm
index 962eea941..7fe78c5c1 100644
--- a/lib/Biber.pm
+++ b/lib/Biber.pm
@@ -486,7 +486,6 @@ sub parse_ctrlfile {
                                                            qr/\Acondition\z/,
                                                            qr/\Afilter(?:or)?\z/,
                                                            qr/\Aoptionscope\z/,
-                                                           qr/\Aextradatespec\z/
                                                           ],
                                           'NsStrip' => 1,
                                           'KeyAttr' => []);
@@ -674,26 +673,13 @@ sub parse_ctrlfile {
   }
 
   # EXTRADATE specification
-  foreach my $eds ($bcfxml->{extradatespec}->@*) {
-    my $edtype = $eds->{type};
-    my $ed;
-    foreach my $scope ($eds->{scope}->@*) {
-      my $fields;
-      foreach my $field (sort {$a->{order} <=> $b->{order}} $scope->{field}->@*) {
-        push $fields->@*, $field->{content};
-      }
-      push $ed->@*, $fields;
-    }
-
-    if ($edtype eq 'global') {
-      Biber::Config->setblxoption(undef, 'extradatespec', $ed);
-    }
-    else {
-      Biber::Config->setblxoption(undef, 'extradatespec',
-                                  $ed,
-                                  'ENTRYTYPE',
-                                  $edtype);
+  my $ed;
+  foreach my $scope ($bcfxml->{extradatespec}->{scope}->@*) {
+    my $fields;
+    foreach my $field (sort {$a->{order} <=> $b->{order}} $scope->{field}->@*) {
+      push $fields->@*, $field->{content};
     }
+    push $ed->@*, $fields;
   }
 
   # INHERITANCE schemes for crossreferences (always global)
diff --git a/lib/Biber/Constants.pm b/lib/Biber/Constants.pm
index dc0f5a967..ae06da3a7 100644
--- a/lib/Biber/Constants.pm
+++ b/lib/Biber/Constants.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw{
 
 # Version of biblatex control file which this release expects. Matched against version
 # passed in control file. Used when checking the .bcf
-our $BCF_VERSION = '3.12';
+our $BCF_VERSION = '3.11';
 # Format version of the .bbl. Used when writing the .bbl
 our $BBL_VERSION = '3.3';
 
diff --git a/t/tdata/annotations.bcf b/t/tdata/annotations.bcf
index c54c1425e..9fbb9e347 100644
--- a/t/tdata/annotations.bcf
+++ b/t/tdata/annotations.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/basic-misc.bcf b/t/tdata/basic-misc.bcf
index 9d832237c..812af04cf 100644
--- a/t/tdata/basic-misc.bcf
+++ b/t/tdata/basic-misc.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -384,7 +384,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -607,7 +606,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/biblatexml.bcf b/t/tdata/biblatexml.bcf
index 7287e3a84..f7ba37a99 100644
--- a/t/tdata/biblatexml.bcf
+++ b/t/tdata/biblatexml.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -624,7 +623,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/bibtex-aliases.bcf b/t/tdata/bibtex-aliases.bcf
index 97fa1ef4b..e4f554e82 100644
--- a/t/tdata/bibtex-aliases.bcf
+++ b/t/tdata/bibtex-aliases.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -373,7 +373,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -650,7 +649,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/bibtex-output.bcf b/t/tdata/bibtex-output.bcf
index d2c38686e..05f8b960f 100644
--- a/t/tdata/bibtex-output.bcf
+++ b/t/tdata/bibtex-output.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -377,7 +377,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -595,7 +594,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/crossrefs.bcf b/t/tdata/crossrefs.bcf
index b33e70f34..3beb15397 100644
--- a/t/tdata/crossrefs.bcf
+++ b/t/tdata/crossrefs.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/datalists.bcf b/t/tdata/datalists.bcf
index 78d152e75..5ac2a7b18 100644
--- a/t/tdata/datalists.bcf
+++ b/t/tdata/datalists.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/dateformats.bcf b/t/tdata/dateformats.bcf
index 57d8352ef..16c3af2da 100644
--- a/t/tdata/dateformats.bcf
+++ b/t/tdata/dateformats.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -603,7 +602,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/dm-constraints.bcf b/t/tdata/dm-constraints.bcf
index c835f25e4..b6d266218 100644
--- a/t/tdata/dm-constraints.bcf
+++ b/t/tdata/dm-constraints.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -374,7 +374,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -587,7 +586,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/encoding1.bcf b/t/tdata/encoding1.bcf
index 4bdc720f6..df2c72f68 100644
--- a/t/tdata/encoding1.bcf
+++ b/t/tdata/encoding1.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/encoding2.bcf b/t/tdata/encoding2.bcf
index 2db9bfe4d..fb7b57154 100644
--- a/t/tdata/encoding2.bcf
+++ b/t/tdata/encoding2.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/encoding3.bcf b/t/tdata/encoding3.bcf
index 70ecc93cb..c4027a509 100644
--- a/t/tdata/encoding3.bcf
+++ b/t/tdata/encoding3.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/encoding4.bcf b/t/tdata/encoding4.bcf
index c9fe7f4e5..3b2689d4c 100644
--- a/t/tdata/encoding4.bcf
+++ b/t/tdata/encoding4.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/encoding5.bcf b/t/tdata/encoding5.bcf
index 458dca087..eecac47df 100644
--- a/t/tdata/encoding5.bcf
+++ b/t/tdata/encoding5.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/encoding6.bcf b/t/tdata/encoding6.bcf
index 762062c1d..acc54c42d 100644
--- a/t/tdata/encoding6.bcf
+++ b/t/tdata/encoding6.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/extradate.bcf b/t/tdata/extradate.bcf
index f015bf8fa..4e3caf8ef 100644
--- a/t/tdata/extradate.bcf
+++ b/t/tdata/extradate.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -392,7 +392,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -605,7 +604,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/extratitle.bcf b/t/tdata/extratitle.bcf
index 19a246b34..b2c4fd226 100644
--- a/t/tdata/extratitle.bcf
+++ b/t/tdata/extratitle.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -603,7 +602,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/extratitleyear.bcf b/t/tdata/extratitleyear.bcf
index e65a4c672..476b80c70 100644
--- a/t/tdata/extratitleyear.bcf
+++ b/t/tdata/extratitleyear.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -603,7 +602,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/full-bbl.bcf b/t/tdata/full-bbl.bcf
index 196297e61..8b7a97d7f 100644
--- a/t/tdata/full-bbl.bcf
+++ b/t/tdata/full-bbl.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/full-bibtex.bcf b/t/tdata/full-bibtex.bcf
index 1ccac21f2..0144a5520 100644
--- a/t/tdata/full-bibtex.bcf
+++ b/t/tdata/full-bibtex.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/full-dot.bcf b/t/tdata/full-dot.bcf
index 028333b75..f17929445 100644
--- a/t/tdata/full-dot.bcf
+++ b/t/tdata/full-dot.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../data/bcf.xsl"?>
 <?xml-model href="../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -596,7 +595,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/general.bcf b/t/tdata/general.bcf
index 0bd4c2a7d..33fe87750 100644
--- a/t/tdata/general.bcf
+++ b/t/tdata/general.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -383,7 +383,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -596,7 +595,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/labelalpha.bcf b/t/tdata/labelalpha.bcf
index 5660726b5..e08297736 100644
--- a/t/tdata/labelalpha.bcf
+++ b/t/tdata/labelalpha.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -398,7 +398,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -687,7 +686,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/labelalphaname.bcf b/t/tdata/labelalphaname.bcf
index defcf4c45..77a2644d0 100644
--- a/t/tdata/labelalphaname.bcf
+++ b/t/tdata/labelalphaname.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -398,7 +398,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -696,7 +695,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/maps.bcf b/t/tdata/maps.bcf
index 21d625baf..9709bfa43 100644
--- a/t/tdata/maps.bcf
+++ b/t/tdata/maps.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -384,7 +384,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -587,7 +586,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/names.bcf b/t/tdata/names.bcf
index 96f8a57f1..8c1455051 100644
--- a/t/tdata/names.bcf
+++ b/t/tdata/names.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -603,7 +602,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/names_x.bcf b/t/tdata/names_x.bcf
index bf647140a..41555414b 100644
--- a/t/tdata/names_x.bcf
+++ b/t/tdata/names_x.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -603,7 +602,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/options.bcf b/t/tdata/options.bcf
index b7e6b6589..cc2eb1898 100644
--- a/t/tdata/options.bcf
+++ b/t/tdata/options.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -385,7 +385,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -599,7 +598,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/related.bcf b/t/tdata/related.bcf
index 57c926fb5..bd9acce69 100644
--- a/t/tdata/related.bcf
+++ b/t/tdata/related.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/remote-files.bcf b/t/tdata/remote-files.bcf
index be1d8e247..a5e45fa17 100644
--- a/t/tdata/remote-files.bcf
+++ b/t/tdata/remote-files.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -386,7 +386,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -599,7 +598,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/sections-complex.bcf b/t/tdata/sections-complex.bcf
index 925ce700c..d0c453c81 100644
--- a/t/tdata/sections-complex.bcf
+++ b/t/tdata/sections-complex.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -610,7 +609,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/sections.bcf b/t/tdata/sections.bcf
index 108429efd..af786b3c5 100644
--- a/t/tdata/sections.bcf
+++ b/t/tdata/sections.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -603,7 +602,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/set-dynamic.bcf b/t/tdata/set-dynamic.bcf
index 0aada6d14..af9d16443 100644
--- a/t/tdata/set-dynamic.bcf
+++ b/t/tdata/set-dynamic.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/set-legacy.bcf b/t/tdata/set-legacy.bcf
index 278293958..22d3fac77 100644
--- a/t/tdata/set-legacy.bcf
+++ b/t/tdata/set-legacy.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/set-static.bcf b/t/tdata/set-static.bcf
index f57272919..a769d0410 100644
--- a/t/tdata/set-static.bcf
+++ b/t/tdata/set-static.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/skips.bcf b/t/tdata/skips.bcf
index 4cdd2fc77..6a2e630e8 100644
--- a/t/tdata/skips.bcf
+++ b/t/tdata/skips.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -391,7 +391,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -604,7 +603,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/skipsg.bcf b/t/tdata/skipsg.bcf
index 2aa00eb2c..525933ad8 100644
--- a/t/tdata/skipsg.bcf
+++ b/t/tdata/skipsg.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -391,7 +391,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -604,7 +603,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/sort-case.bcf b/t/tdata/sort-case.bcf
index c256ced1f..014ad6258 100644
--- a/t/tdata/sort-case.bcf
+++ b/t/tdata/sort-case.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/sort-complex.bcf b/t/tdata/sort-complex.bcf
index 11d4088e8..9c0b76154 100644
--- a/t/tdata/sort-complex.bcf
+++ b/t/tdata/sort-complex.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -390,7 +390,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -603,7 +602,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/sort-names.bcf b/t/tdata/sort-names.bcf
index d8efc3a41..56cdff4a5 100644
--- a/t/tdata/sort-names.bcf
+++ b/t/tdata/sort-names.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/sort-order.bcf b/t/tdata/sort-order.bcf
index 6b6335b72..42845b526 100644
--- a/t/tdata/sort-order.bcf
+++ b/t/tdata/sort-order.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/sort-uc.bcf b/t/tdata/sort-uc.bcf
index 1c027c250..179b0c6cc 100644
--- a/t/tdata/sort-uc.bcf
+++ b/t/tdata/sort-uc.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/translit.bcf b/t/tdata/translit.bcf
index 4a220b944..acd06a394 100644
--- a/t/tdata/translit.bcf
+++ b/t/tdata/translit.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- BIBER OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -445,7 +445,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -660,7 +659,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/truncation.bcf b/t/tdata/truncation.bcf
index ba4889c2b..b992eae60 100644
--- a/t/tdata/truncation.bcf
+++ b/t/tdata/truncation.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness-nameparts.bcf b/t/tdata/uniqueness-nameparts.bcf
index f693c7d57..cfea1c605 100644
--- a/t/tdata/uniqueness-nameparts.bcf
+++ b/t/tdata/uniqueness-nameparts.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -594,7 +593,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness1.bcf b/t/tdata/uniqueness1.bcf
index 9eccac881..1fd72e559 100644
--- a/t/tdata/uniqueness1.bcf
+++ b/t/tdata/uniqueness1.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness2.bcf b/t/tdata/uniqueness2.bcf
index 664603508..668dfe9ee 100644
--- a/t/tdata/uniqueness2.bcf
+++ b/t/tdata/uniqueness2.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness3.bcf b/t/tdata/uniqueness3.bcf
index e02ac4537..591f281ec 100644
--- a/t/tdata/uniqueness3.bcf
+++ b/t/tdata/uniqueness3.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness4.bcf b/t/tdata/uniqueness4.bcf
index 31f609c9c..a1b7b5aeb 100644
--- a/t/tdata/uniqueness4.bcf
+++ b/t/tdata/uniqueness4.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness5.bcf b/t/tdata/uniqueness5.bcf
index 5d435d854..45c195932 100644
--- a/t/tdata/uniqueness5.bcf
+++ b/t/tdata/uniqueness5.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness6.bcf b/t/tdata/uniqueness6.bcf
index 5fc2f022d..60dac61b0 100644
--- a/t/tdata/uniqueness6.bcf
+++ b/t/tdata/uniqueness6.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/uniqueness7.bcf b/t/tdata/uniqueness7.bcf
index 86282fa4e..a7b7d5d7b 100644
--- a/t/tdata/uniqueness7.bcf
+++ b/t/tdata/uniqueness7.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -379,7 +379,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -592,7 +591,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>
diff --git a/t/tdata/xdata.bcf b/t/tdata/xdata.bcf
index dc33fd50f..b2762a230 100644
--- a/t/tdata/xdata.bcf
+++ b/t/tdata/xdata.bcf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../../data/bcf.xsl"?>
 <?xml-model href="../../data/schemata/bcf.rnc" type="application/relax-ng-compact-syntax"?>
-<bcf:controlfile version="3.12" bltxversion="3.21" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.11" bltxversion="3.20" xmlns:bcf="https://sourceforge.net/projects/biblatex">
   <!-- OPTIONS -->
   <bcf:options component="biber" type="global">
     <bcf:option type="singlevalued">
@@ -378,7 +378,6 @@
     <bcf:option datatype="integer">dateeraauto</bcf:option>
   </bcf:optionscope>
   <bcf:optionscope type="ENTRYTYPE">
-    <bcf:option datatype="xml">extradatespec</bcf:option>
     <bcf:option datatype="xml">extradatecontext</bcf:option>
     <bcf:option datatype="string">alphaothers</bcf:option>
     <bcf:option datatype="string">sortalphaothers</bcf:option>
@@ -591,7 +590,7 @@
     </bcf:labelelement>
   </bcf:labelalphatemplate>
   <!-- EXTRADATE -->
-  <bcf:extradatespec type="global">
+  <bcf:extradatespec>
     <bcf:scope>
       <bcf:field order="1">labelyear</bcf:field>
       <bcf:field order="2">year</bcf:field>