diff --git a/index.bs b/index.bs
index 5b421da..b399313 100644
--- a/index.bs
+++ b/index.bs
@@ -2177,7 +2177,7 @@ of indexed databases.
 [Exposed=(Window,Worker)]
 interface IDBFactory {
   [NewObject] IDBOpenDBRequest open(DOMString name,
-                                    [EnforceRange] optional unsigned long long version);
+                                    optional [EnforceRange] unsigned long long version);
   [NewObject] IDBOpenDBRequest deleteDatabase(DOMString name);
 
   short cmp(any first, any second);
@@ -2732,9 +2732,9 @@ interface IDBObjectStore {
   [NewObject] IDBRequest get(any query);
   [NewObject] IDBRequest getKey(any query);
   [NewObject] IDBRequest getAll(optional any query,
-                                [EnforceRange] optional unsigned long count);
+                                optional [EnforceRange] unsigned long count);
   [NewObject] IDBRequest getAllKeys(optional any query,
-                                    [EnforceRange] optional unsigned long count);
+                                    optional [EnforceRange] unsigned long count);
   [NewObject] IDBRequest count(optional any query);
 
   [NewObject] IDBRequest openCursor(optional any query,
@@ -3830,9 +3830,9 @@ interface IDBIndex {
   [NewObject] IDBRequest get(any query);
   [NewObject] IDBRequest getKey(any query);
   [NewObject] IDBRequest getAll(optional any query,
-                                [EnforceRange] optional unsigned long count);
+                                optional [EnforceRange] unsigned long count);
   [NewObject] IDBRequest getAllKeys(optional any query,
-                                    [EnforceRange] optional unsigned long count);
+                                    optional [EnforceRange] unsigned long count);
   [NewObject] IDBRequest count(optional any query);
 
   [NewObject] IDBRequest openCursor(optional any query,
diff --git a/index.html b/index.html
index 5e4430f..5bdef78 100644
--- a/index.html
+++ b/index.html
@@ -3116,7 +3116,7 @@ <h3 class="heading settled" data-level="4.3" id="factory-interface"><span class=
 <pre class="idl highlight def">[<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed">Exposed</a>=(<span class="n">Window</span>,<span class="n">Worker</span>)]
 <span class="kt">interface</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="interface" data-export="" id="idbfactory">IDBFactory</dfn> {
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbopendbrequest" id="ref-for-idbopendbrequest-1">IDBOpenDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbfactory-open" id="ref-for-dom-idbfactory-open-2">open</a>(<a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-DOMString"><span class="kt">DOMString</span></a> <dfn class="nv idl-code" data-dfn-for="IDBFactory/open(name, version), IDBFactory/open(name)" data-dfn-type="argument" data-export="" id="dom-idbfactory-open-name-version-name">name<a class="self-link" href="#dom-idbfactory-open-name-version-name"></a></dfn>,
-                                    [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <span class="kt">optional</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long-long"><span class="kt">unsigned</span> <span class="kt">long</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBFactory/open(name, version), IDBFactory/open(name)" data-dfn-type="argument" data-export="" id="dom-idbfactory-open-name-version-version">version<a class="self-link" href="#dom-idbfactory-open-name-version-version"></a></dfn>);
+                                    <span class="kt">optional</span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long-long"><span class="kt">unsigned</span> <span class="kt">long</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBFactory/open(name, version), IDBFactory/open(name)" data-dfn-type="argument" data-export="" id="dom-idbfactory-open-name-version-version">version<a class="self-link" href="#dom-idbfactory-open-name-version-version"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbopendbrequest" id="ref-for-idbopendbrequest-2">IDBOpenDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbfactory-deletedatabase" id="ref-for-dom-idbfactory-deletedatabase-1">deleteDatabase</a>(<a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-DOMString"><span class="kt">DOMString</span></a> <dfn class="nv idl-code" data-dfn-for="IDBFactory/deleteDatabase(name)" data-dfn-type="argument" data-export="" id="dom-idbfactory-deletedatabase-name-name">name<a class="self-link" href="#dom-idbfactory-deletedatabase-name-name"></a></dfn>);
 
   <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-short"><span class="kt">short</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbfactory-cmp" id="ref-for-dom-idbfactory-cmp-1">cmp</a>(<span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBFactory/cmp(first, second)" data-dfn-type="argument" data-export="" id="dom-idbfactory-cmp-first-second-first">first<a class="self-link" href="#dom-idbfactory-cmp-first-second-first"></a></dfn>, <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBFactory/cmp(first, second)" data-dfn-type="argument" data-export="" id="dom-idbfactory-cmp-first-second-second">second<a class="self-link" href="#dom-idbfactory-cmp-first-second-second"></a></dfn>);
@@ -3496,9 +3496,9 @@ <h3 class="heading settled" data-level="4.5" id="object-store-interface"><span c
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-11">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-get" id="ref-for-dom-idbobjectstore-get-1">get</a>(<span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/get(query)" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-get-query-query">query<a class="self-link" href="#dom-idbobjectstore-get-query-query"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-12">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-getkey" id="ref-for-dom-idbobjectstore-getkey-1">getKey</a>(<span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/getKey(query)" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-getkey-query-query">query<a class="self-link" href="#dom-idbobjectstore-getkey-query-query"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-13">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-getall" id="ref-for-dom-idbobjectstore-getall-1">getAll</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/getAll(query, count), IDBObjectStore/getAll(query), IDBObjectStore/getAll()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-getall-query-count-query">query<a class="self-link" href="#dom-idbobjectstore-getall-query-count-query"></a></dfn>,
-                                [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <span class="kt">optional</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/getAll(query, count), IDBObjectStore/getAll(query), IDBObjectStore/getAll()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-getall-query-count-count">count<a class="self-link" href="#dom-idbobjectstore-getall-query-count-count"></a></dfn>);
+                                <span class="kt">optional</span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/getAll(query, count), IDBObjectStore/getAll(query), IDBObjectStore/getAll()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-getall-query-count-count">count<a class="self-link" href="#dom-idbobjectstore-getall-query-count-count"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-14">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-getallkeys" id="ref-for-dom-idbobjectstore-getallkeys-1">getAllKeys</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/getAllKeys(query, count), IDBObjectStore/getAllKeys(query), IDBObjectStore/getAllKeys()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-getallkeys-query-count-query">query<a class="self-link" href="#dom-idbobjectstore-getallkeys-query-count-query"></a></dfn>,
-                                    [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <span class="kt">optional</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/getAllKeys(query, count), IDBObjectStore/getAllKeys(query), IDBObjectStore/getAllKeys()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-getallkeys-query-count-count">count<a class="self-link" href="#dom-idbobjectstore-getallkeys-query-count-count"></a></dfn>);
+                                    <span class="kt">optional</span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/getAllKeys(query, count), IDBObjectStore/getAllKeys(query), IDBObjectStore/getAllKeys()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-getallkeys-query-count-count">count<a class="self-link" href="#dom-idbobjectstore-getallkeys-query-count-count"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-15">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-count" id="ref-for-dom-idbobjectstore-count-1">count</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/count(query), IDBObjectStore/count()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-count-query-query">query<a class="self-link" href="#dom-idbobjectstore-count-query-query"></a></dfn>);
 
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-16">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-opencursor" id="ref-for-dom-idbobjectstore-opencursor-1">openCursor</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBObjectStore/openCursor(query, direction), IDBObjectStore/openCursor(query), IDBObjectStore/openCursor()" data-dfn-type="argument" data-export="" id="dom-idbobjectstore-opencursor-query-direction-query">query<a class="self-link" href="#dom-idbobjectstore-opencursor-query-direction-query"></a></dfn>,
@@ -4250,9 +4250,9 @@ <h3 class="heading settled" data-level="4.6" id="index-interface"><span class="s
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-31">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-get" id="ref-for-dom-idbindex-get-1">get</a>(<span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBIndex/get(query)" data-dfn-type="argument" data-export="" id="dom-idbindex-get-query-query">query<a class="self-link" href="#dom-idbindex-get-query-query"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-32">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-getkey" id="ref-for-dom-idbindex-getkey-1">getKey</a>(<span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBIndex/getKey(query)" data-dfn-type="argument" data-export="" id="dom-idbindex-getkey-query-query">query<a class="self-link" href="#dom-idbindex-getkey-query-query"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-33">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-getall" id="ref-for-dom-idbindex-getall-1">getAll</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBIndex/getAll(query, count), IDBIndex/getAll(query), IDBIndex/getAll()" data-dfn-type="argument" data-export="" id="dom-idbindex-getall-query-count-query">query<a class="self-link" href="#dom-idbindex-getall-query-count-query"></a></dfn>,
-                                [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <span class="kt">optional</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBIndex/getAll(query, count), IDBIndex/getAll(query), IDBIndex/getAll()" data-dfn-type="argument" data-export="" id="dom-idbindex-getall-query-count-count">count<a class="self-link" href="#dom-idbindex-getall-query-count-count"></a></dfn>);
+                                <span class="kt">optional</span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBIndex/getAll(query, count), IDBIndex/getAll(query), IDBIndex/getAll()" data-dfn-type="argument" data-export="" id="dom-idbindex-getall-query-count-count">count<a class="self-link" href="#dom-idbindex-getall-query-count-count"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-34">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-getallkeys" id="ref-for-dom-idbindex-getallkeys-1">getAllKeys</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBIndex/getAllKeys(query, count), IDBIndex/getAllKeys(query), IDBIndex/getAllKeys()" data-dfn-type="argument" data-export="" id="dom-idbindex-getallkeys-query-count-query">query<a class="self-link" href="#dom-idbindex-getallkeys-query-count-query"></a></dfn>,
-                                    [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <span class="kt">optional</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBIndex/getAllKeys(query, count), IDBIndex/getAllKeys(query), IDBIndex/getAllKeys()" data-dfn-type="argument" data-export="" id="dom-idbindex-getallkeys-query-count-count">count<a class="self-link" href="#dom-idbindex-getallkeys-query-count-count"></a></dfn>);
+                                    <span class="kt">optional</span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange">EnforceRange</a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt">unsigned</span> <span class="kt">long</span></a> <dfn class="nv idl-code" data-dfn-for="IDBIndex/getAllKeys(query, count), IDBIndex/getAllKeys(query), IDBIndex/getAllKeys()" data-dfn-type="argument" data-export="" id="dom-idbindex-getallkeys-query-count-count">count<a class="self-link" href="#dom-idbindex-getallkeys-query-count-count"></a></dfn>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-35">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-count" id="ref-for-dom-idbindex-count-1">count</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBIndex/count(query), IDBIndex/count()" data-dfn-type="argument" data-export="" id="dom-idbindex-count-query-query">query<a class="self-link" href="#dom-idbindex-count-query-query"></a></dfn>);
 
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject">NewObject</a>] <a class="n" data-link-type="idl-name" href="#idbrequest" id="ref-for-idbrequest-36">IDBRequest</a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-opencursor" id="ref-for-dom-idbindex-opencursor-1">openCursor</a>(<span class="kt">optional</span> <span class="kt">any</span> <dfn class="nv idl-code" data-dfn-for="IDBIndex/openCursor(query, direction), IDBIndex/openCursor(query), IDBIndex/openCursor()" data-dfn-type="argument" data-export="" id="dom-idbindex-opencursor-query-direction-query">query<a class="self-link" href="#dom-idbindex-opencursor-query-direction-query"></a></dfn>,
@@ -7500,7 +7500,7 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
 [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed"><span class="nv">Exposed</span></a>=(<span class="n"><span class="n">Window</span></span>,<span class="n"><span class="n">Worker</span></span>)]
 <span class="kt"><span class="kt">interface</span></span> <a class="nv" href="#idbfactory"><span class="nv">IDBFactory</span></a> {
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbopendbrequest"><span class="n">IDBOpenDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbfactory-open"><span class="nv">open</span></a>(<a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-DOMString"><span class="kt"><span class="kt">DOMString</span></span></a> <a class="nv" href="#dom-idbfactory-open-name-version-name"><span class="nv">name</span></a>,
-                                    [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <span class="kt"><span class="kt">optional</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbfactory-open-name-version-version"><span class="nv">version</span></a>);
+                                    <span class="kt"><span class="kt">optional</span></span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbfactory-open-name-version-version"><span class="nv">version</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbopendbrequest"><span class="n">IDBOpenDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbfactory-deletedatabase"><span class="nv">deleteDatabase</span></a>(<a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-DOMString"><span class="kt"><span class="kt">DOMString</span></span></a> <a class="nv" href="#dom-idbfactory-deletedatabase-name-name"><span class="nv">name</span></a>);
 
   <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-short"><span class="kt"><span class="kt">short</span></span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbfactory-cmp"><span class="nv">cmp</span></a>(<span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbfactory-cmp-first-second-first"><span class="nv">first</span></a>, <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbfactory-cmp-first-second-second"><span class="nv">second</span></a>);
@@ -7547,9 +7547,9 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-get"><span class="nv">get</span></a>(<span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbobjectstore-get-query-query"><span class="nv">query</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-getkey"><span class="nv">getKey</span></a>(<span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbobjectstore-getkey-query-query"><span class="nv">query</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-getall"><span class="nv">getAll</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbobjectstore-getall-query-count-query"><span class="nv">query</span></a>,
-                                [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <span class="kt"><span class="kt">optional</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbobjectstore-getall-query-count-count"><span class="nv">count</span></a>);
+                                <span class="kt"><span class="kt">optional</span></span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbobjectstore-getall-query-count-count"><span class="nv">count</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-getallkeys"><span class="nv">getAllKeys</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbobjectstore-getallkeys-query-count-query"><span class="nv">query</span></a>,
-                                    [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <span class="kt"><span class="kt">optional</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbobjectstore-getallkeys-query-count-count"><span class="nv">count</span></a>);
+                                    <span class="kt"><span class="kt">optional</span></span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbobjectstore-getallkeys-query-count-count"><span class="nv">count</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-count"><span class="nv">count</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbobjectstore-count-query-query"><span class="nv">query</span></a>);
 
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbobjectstore-opencursor"><span class="nv">openCursor</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbobjectstore-opencursor-query-direction-query"><span class="nv">query</span></a>,
@@ -7581,9 +7581,9 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-get"><span class="nv">get</span></a>(<span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbindex-get-query-query"><span class="nv">query</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-getkey"><span class="nv">getKey</span></a>(<span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbindex-getkey-query-query"><span class="nv">query</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-getall"><span class="nv">getAll</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbindex-getall-query-count-query"><span class="nv">query</span></a>,
-                                [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <span class="kt"><span class="kt">optional</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbindex-getall-query-count-count"><span class="nv">count</span></a>);
+                                <span class="kt"><span class="kt">optional</span></span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbindex-getall-query-count-count"><span class="nv">count</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-getallkeys"><span class="nv">getAllKeys</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbindex-getallkeys-query-count-query"><span class="nv">query</span></a>,
-                                    [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <span class="kt"><span class="kt">optional</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbindex-getallkeys-query-count-count"><span class="nv">count</span></a>);
+                                    <span class="kt"><span class="kt">optional</span></span> [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#EnforceRange"><span class="nv">EnforceRange</span></a>] <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-unsigned-long"><span class="kt"><span class="kt">unsigned</span></span> <span class="kt"><span class="kt">long</span></span></a> <a class="nv" href="#dom-idbindex-getallkeys-query-count-count"><span class="nv">count</span></a>);
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-count"><span class="nv">count</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbindex-count-query-query"><span class="nv">query</span></a>);
 
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <a class="n" data-link-type="idl-name" href="#idbrequest"><span class="n">IDBRequest</span></a> <a class="nv idl-code" data-link-type="method" href="#dom-idbindex-opencursor"><span class="nv">openCursor</span></a>(<span class="kt"><span class="kt">optional</span></span> <span class="kt"><span class="kt">any</span></span> <a class="nv" href="#dom-idbindex-opencursor-query-direction-query"><span class="nv">query</span></a>,