diff --git a/index.html b/index.html
index dd39085..a3364bd 100644
--- a/index.html
+++ b/index.html
@@ -1149,7 +1149,7 @@
 });
 
 let sdoMap = JSON.parse(`{}`);
-let biblio = JSON.parse(`{"refsByClause":{"sec-object.groupby":["_ref_0","_ref_1","_ref_2","_ref_3","_ref_4"],"sec-map.groupby":["_ref_5","_ref_6","_ref_7","_ref_8","_ref_9","_ref_10","_ref_11"],"sec-group-by":["_ref_12","_ref_13","_ref_14","_ref_15","_ref_16","_ref_17","_ref_18","_ref_19","_ref_20","_ref_21","_ref_22","_ref_23","_ref_24","_ref_25","_ref_26","_ref_27","_ref_28","_ref_29","_ref_30","_ref_31"],"sec-add-value-to-keyed-group":["_ref_32"]},"entries":[{"type":"clause","id":"sec-scope","titleHTML":"Scope","number":"1"},{"type":"clause","id":"sec-object.groupby","title":"Object.groupBy ( items, callbackfn [ , thisArg ] )","titleHTML":"Object.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )","number":"2.1"},{"type":"clause","id":"sec-map.groupby","title":"Map.groupBy ( items, callbackfn [ , thisArg ] )","titleHTML":"Map.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )","number":"2.2"},{"type":"op","aoid":"GroupBy","refId":"sec-group-by"},{"type":"clause","id":"sec-group-by","title":"GroupBy ( items, callbackfn, thisArg, coercion )","titleHTML":"GroupBy ( <var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <var>coercion</var> )","number":"2.3","referencingIds":["_ref_2","_ref_9"]},{"type":"op","aoid":"AddValueToKeyedGroup","refId":"sec-add-value-to-keyed-group"},{"type":"clause","id":"sec-add-value-to-keyed-group","title":"AddValueToKeyedGroup ( groups, key, value )","titleHTML":"AddValueToKeyedGroup ( <var>groups</var>, <var>key</var>, <var>value</var> )","number":"2.4","referencingIds":["_ref_24","_ref_31"]},{"type":"clause","id":"sec-properties-of-the-array-prototype-object","titleHTML":"Properties of the Array Prototype Object (22.1.3)","number":"2"},{"type":"clause","id":"sec-copyright-and-software-license","title":"Copyright & Software License","titleHTML":"Copyright &amp; Software License","number":"A"}]}`);
+let biblio = JSON.parse(`{"refsByClause":{"sec-object.groupby":["_ref_0","_ref_1","_ref_2","_ref_3","_ref_4"],"sec-map.groupby":["_ref_5","_ref_6","_ref_7","_ref_8","_ref_9","_ref_10","_ref_11"],"sec-group-by":["_ref_12","_ref_13","_ref_14","_ref_15","_ref_16","_ref_17","_ref_18","_ref_19","_ref_20","_ref_21","_ref_22","_ref_23","_ref_24","_ref_25","_ref_26","_ref_27","_ref_28","_ref_29","_ref_30","_ref_31"],"sec-add-value-to-keyed-group":["_ref_32"]},"entries":[{"type":"clause","id":"sec-scope","titleHTML":"Scope","number":"1"},{"type":"clause","id":"sec-object.groupby","title":"Object.groupBy ( items, callbackfn [ , thisArg ] )","titleHTML":"Object.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )","number":"2.1"},{"type":"clause","id":"sec-properties-of-the-object-constructor","titleHTML":"Properties of the Object Constructor (20.1.2)","number":"2"},{"type":"clause","id":"sec-map.groupby","title":"Map.groupBy ( items, callbackfn [ , thisArg ] )","titleHTML":"Map.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )","number":"3.1"},{"type":"op","aoid":"GroupBy","refId":"sec-group-by"},{"type":"clause","id":"sec-group-by","title":"GroupBy ( items, callbackfn, thisArg, coercion )","titleHTML":"GroupBy ( <var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <var>coercion</var> )","number":"3.2","referencingIds":["_ref_2","_ref_9"]},{"type":"op","aoid":"AddValueToKeyedGroup","refId":"sec-add-value-to-keyed-group"},{"type":"clause","id":"sec-add-value-to-keyed-group","title":"AddValueToKeyedGroup ( groups, key, value )","titleHTML":"AddValueToKeyedGroup ( <var>groups</var>, <var>key</var>, <var>value</var> )","number":"3.3","referencingIds":["_ref_24","_ref_31"]},{"type":"clause","id":"sec-properties-of-the-map-constructor","titleHTML":"Properties of the Map Constructor (24.1.2)","number":"3"},{"type":"clause","id":"sec-copyright-and-software-license","title":"Copyright & Software License","titleHTML":"Copyright &amp; Software License","number":"A"}]}`);
 ;let usesMultipage = false</script><style>body {
   display: flex;
   font-size: 18px;
@@ -2414,7 +2414,7 @@
 </ul></div><div id="menu-toggle"><svg xmlns="http://www.w3.org/2000/svg" style="width:100%; height:100%; stroke:currentColor" viewBox="0 0 120 120">
       <title>Menu</title>
       <path stroke-width="10" stroke-linecap="round" d="M30,60 h60  M30,30 m0,5 h60  M30,90 m0,-5 h60"></path>
-    </svg></div><div id="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins</div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-scope" title="Scope"><span class="secnum">1</span> Scope</a></li><li><span class="item-toggle">◢</span><a href="#sec-properties-of-the-array-prototype-object" title="Properties of the Array Prototype Object (22.1.3)"><span class="secnum">2</span> Properties of the Array Prototype Object (22.1.3)</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-object.groupby" title="Object.groupBy ( items, callbackfn [ , thisArg ] )"><span class="secnum">2.1</span> Object.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )</a></li><li><span class="item-toggle-none"></span><a href="#sec-map.groupby" title="Map.groupBy ( items, callbackfn [ , thisArg ] )"><span class="secnum">2.2</span> Map.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )</a></li><li><span class="item-toggle-none"></span><a href="#sec-group-by" title="GroupBy ( items, callbackfn, thisArg, coercion )"><span class="secnum">2.3</span> GroupBy ( <var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <var>coercion</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-add-value-to-keyed-group" title="AddValueToKeyedGroup ( groups, key, value )"><span class="secnum">2.4</span> AddValueToKeyedGroup ( <var>groups</var>, <var>key</var>, <var>value</var> )</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-copyright-and-software-license" title="Copyright &amp; Software License"><span class="secnum">A</span> Copyright &amp; Software License</a></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 3 Draft / November 29, 2022</h1><h1 class="title">Array Grouping</h1>
+    </svg></div><div id="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins</div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-scope" title="Scope"><span class="secnum">1</span> Scope</a></li><li><span class="item-toggle">◢</span><a href="#sec-properties-of-the-object-constructor" title="Properties of the Object Constructor (20.1.2)"><span class="secnum">2</span> Properties of the Object Constructor (20.1.2)</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-object.groupby" title="Object.groupBy ( items, callbackfn [ , thisArg ] )"><span class="secnum">2.1</span> Object.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )</a></li></ol></li><li><span class="item-toggle">◢</span><a href="#sec-properties-of-the-map-constructor" title="Properties of the Map Constructor (24.1.2)"><span class="secnum">3</span> Properties of the Map Constructor (24.1.2)</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-map.groupby" title="Map.groupBy ( items, callbackfn [ , thisArg ] )"><span class="secnum">3.1</span> Map.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )</a></li><li><span class="item-toggle-none"></span><a href="#sec-group-by" title="GroupBy ( items, callbackfn, thisArg, coercion )"><span class="secnum">3.2</span> GroupBy ( <var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <var>coercion</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-add-value-to-keyed-group" title="AddValueToKeyedGroup ( groups, key, value )"><span class="secnum">3.3</span> AddValueToKeyedGroup ( <var>groups</var>, <var>key</var>, <var>value</var> )</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-copyright-and-software-license" title="Copyright &amp; Software License"><span class="secnum">A</span> Copyright &amp; Software License</a></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 3 Draft / November 29, 2022</h1><h1 class="title">Array Grouping</h1>
 
 <emu-clause id="sec-scope">
   <h1><span class="secnum">1</span> Scope</h1>
@@ -2423,8 +2423,8 @@ <h1><span class="secnum">1</span> Scope</h1>
   </p>
 </emu-clause>
 
-<emu-clause id="sec-properties-of-the-array-prototype-object">
-  <h1><span class="secnum">2</span> Properties of the Array Prototype Object (<a href="https://tc39.es/ecma262/#sec-properties-of-the-array-prototype-object">22.1.3</a>)</h1>
+<emu-clause id="sec-properties-of-the-object-constructor">
+  <h1><span class="secnum">2</span> Properties of the Object Constructor (<a href="https://tc39.es/ecma262/multipage/fundamental-objects.html#sec-properties-of-the-object-constructor">20.1.2</a>)</h1>
 
   <ins class="block">
   <emu-clause id="sec-object.groupby">
@@ -2436,16 +2436,20 @@ <h1><span class="secnum">2.1</span> Object.groupBy ( <var>items</var>, <var>call
       <p>The return value of <code>groupBy</code> is an object that does not inherit from %Object.prototype%.</p>
     </div></emu-note>
     <p>When the <code>groupBy</code> method is called with two or three arguments, the following steps are taken:</p>
-    <emu-alg><ol><li>Let <var>C</var> be the <emu-val>this</emu-val> value.</li><li>If <emu-xref aoid="IsConstructor" id="_ref_0"><a href="https://tc39.es/ecma262/#sec-isconstructor">IsConstructor</a></emu-xref>(<var>C</var>) is <emu-val>false</emu-val>, throw a <emu-val>TypeError</emu-val> exception.</li><li>If <var>C</var> is <emu-xref href="#sec-object-constructor"><a href="https://tc39.es/ecma262/#sec-object-constructor">%Object%</a></emu-xref>, let <var>obj</var> be OrdinaryObjectCreate(<emu-val>null</emu-val>); else let <var>obj</var> be ?&nbsp;<emu-xref aoid="Construct" id="_ref_1"><a href="https://tc39.es/ecma262/#sec-construct">Construct</a></emu-xref>(<var>C</var>).</li><li>Let <var>groups</var> be ?&nbsp;<emu-xref aoid="GroupBy" id="_ref_2"><a href="#sec-group-by">GroupBy</a></emu-xref>(<var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <emu-const>property</emu-const>).</li><li>For each <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { [[Key]], [[Elements]] } <var>g</var> of <var>groups</var>, do<ol><li>Let <var>elements</var> be <emu-xref aoid="CreateArrayFromList" id="_ref_3"><a href="https://tc39.es/ecma262/#sec-createarrayfromlist">CreateArrayFromList</a></emu-xref>(<var>g</var>.[[Elements]]).</li><li>Perform ?&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow" id="_ref_4"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>obj</var>, <var>g</var>.[[Key]], <var>elements</var>).</li></ol></li><li>Return <var>obj</var>.</li></ol></emu-alg>
+    <emu-alg><ol><li>Let <var>C</var> be the <emu-val>this</emu-val> value.</li><li>If <emu-xref aoid="IsConstructor" id="_ref_0"><a href="https://tc39.es/ecma262/#sec-isconstructor">IsConstructor</a></emu-xref>(<var>C</var>) is <emu-val>false</emu-val>, set <var>C</var> to <emu-xref href="#sec-object-constructor"><a href="https://tc39.es/ecma262/#sec-object-constructor">%Object%</a></emu-xref>.</li><li>If <var>C</var> is <emu-xref href="#sec-object-constructor"><a href="https://tc39.es/ecma262/#sec-object-constructor">%Object%</a></emu-xref>, let <var>obj</var> be OrdinaryObjectCreate(<emu-val>null</emu-val>); else let <var>obj</var> be ?&nbsp;<emu-xref aoid="Construct" id="_ref_1"><a href="https://tc39.es/ecma262/#sec-construct">Construct</a></emu-xref>(<var>C</var>).</li><li>Let <var>groups</var> be ?&nbsp;<emu-xref aoid="GroupBy" id="_ref_2"><a href="#sec-group-by">GroupBy</a></emu-xref>(<var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <emu-const>property</emu-const>).</li><li>For each <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { [[Key]], [[Elements]] } <var>g</var> of <var>groups</var>, do<ol><li>Let <var>elements</var> be <emu-xref aoid="CreateArrayFromList" id="_ref_3"><a href="https://tc39.es/ecma262/#sec-createarrayfromlist">CreateArrayFromList</a></emu-xref>(<var>g</var>.[[Elements]]).</li><li>Perform ?&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow" id="_ref_4"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>obj</var>, <var>g</var>.[[Key]], <var>elements</var>).</li></ol></li><li>Return <var>obj</var>.</li></ol></emu-alg>
     <emu-note><span class="note">Note 2</span><div class="note-contents">
       <p>This method is an intentionally generic factory method; it does not require that its this value be the Object <emu-xref href="#constructor"><a href="https://tc39.es/ecma262/#constructor">constructor</a></emu-xref>. Therefore it can be transferred to or inherited by any other constructors that have no arguments.</p>
     </div></emu-note>
   </emu-clause>
   </ins>
+</emu-clause>
+
+<emu-clause id="sec-properties-of-the-map-constructor">
+  <h1><span class="secnum">3</span> Properties of the Map Constructor (<a href="https://tc39.es/ecma262/multipage/keyed-collections.html#sec-properties-of-the-map-constructor">24.1.2</a>)</h1>
 
   <ins class="block">
   <emu-clause id="sec-map.groupby">
-    <h1><span class="secnum">2.2</span> Map.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )</h1>
+    <h1><span class="secnum">3.1</span> Map.groupBy ( <var>items</var>, <var>callbackfn</var> [ , <var>thisArg</var> ] )</h1>
     <emu-note><span class="note">Note 1</span><div class="note-contents">
       <p><var>callbackfn</var> should be a function that accepts two arguments. <code>groupBy</code> calls <var>callbackfn</var> once for each element in <var>items</var>, in ascending order, and constructs a new Map of arrays. Each value returned by <var>callbackfn</var> is used as a key in the Map, and the associated element is included in the array in the constructed Map according to this key.</p>
       <p>If a <var>thisArg</var> parameter is provided, it will be used as the <emu-val>this</emu-val> value for each invocation of <var>callbackfn</var>. If it is not provided, <emu-val>undefined</emu-val> is used instead.</p>
@@ -2462,15 +2466,15 @@ <h1><span class="secnum">2.2</span> Map.groupBy ( <var>items</var>, <var>callbac
 
   <ins class="block">
   <emu-clause id="sec-group-by" type="abstract operation" aoid="GroupBy">
-    <h1><span class="secnum">2.3</span> GroupBy ( <var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <var>coercion</var> )</h1>
+    <h1><span class="secnum">3.2</span> GroupBy ( <var>items</var>, <var>callbackfn</var>, <var>thisArg</var>, <var>coercion</var> )</h1>
     <p>The abstract operation GroupBy takes arguments <var>items</var> (an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref>), <var>callbackfn</var> (an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref>), <var>thisArg</var> (an ECMAScript langauge value), and <var>coercion</var> (<emu-const>none</emu-const> or <emu-const>property</emu-const>) and returns either a normal completion containing a <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> of Records with fields [[Key]] (an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref>) and [[Elements]] (a <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> of ECMAScript language values), or a throw completion. It performs the following steps when called:</p>
-    <emu-alg><ol><li>If <emu-xref aoid="IsCallable" id="_ref_12"><a href="https://tc39.es/ecma262/#sec-iscallable">IsCallable</a></emu-xref>(<var>callbackfn</var>) is <emu-val>false</emu-val>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Let <var>groups</var> be a new empty <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref>.</li><li>Let <var>usingIterator</var> be ?&nbsp;<emu-xref aoid="GetMethod" id="_ref_13"><a href="https://tc39.es/ecma262/#sec-getmethod">GetMethod</a></emu-xref>(<var>items</var>, @@iterator).</li><li>If <var>usingIterator</var> is not <emu-val>undefined</emu-val>, then<ol><li>Let <var>iteratorRecord</var> be ?&nbsp;<emu-xref aoid="GetIterator" id="_ref_14"><a href="https://tc39.es/ecma262/#sec-getiterator">GetIterator</a></emu-xref>(<var>items</var>, <emu-const>sync</emu-const>, <var>usingIterator</var>).</li><li>Let <var>k</var> be 0.</li><li>Repeat,<ol><li>If <var>k</var> ≥ 2<sup>53</sup> - 1, then<ol><li>Let <var>error</var> be <emu-xref aoid="ThrowCompletion" id="_ref_15"><a href="https://tc39.es/ecma262/#sec-throwcompletion">ThrowCompletion</a></emu-xref>(a newly created <emu-val>TypeError</emu-val> object).</li><li>Return ?&nbsp;<emu-xref aoid="IteratorClose" id="_ref_16"><a href="https://tc39.es/ecma262/#sec-iteratorclose">IteratorClose</a></emu-xref>(<var>iteratorRecord</var>, <var>error</var>).</li></ol></li><li>Let <var>Pk</var> be !&nbsp;<emu-xref aoid="ToString" id="_ref_17"><a href="https://tc39.es/ecma262/#sec-tostring">ToString</a></emu-xref>(<emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>)).</li><li>Let <var>next</var> be ?&nbsp;<emu-xref aoid="IteratorStep" id="_ref_18"><a href="https://tc39.es/ecma262/#sec-iteratorstep">IteratorStep</a></emu-xref>(<var>iteratorRecord</var>).</li><li>If <var>next</var> is <emu-val>false</emu-val>, then<ol><li>Return <var>groups</var>.</li></ol></li><li>Let <var>value</var> be ?&nbsp;<emu-xref aoid="IteratorValue" id="_ref_19"><a href="https://tc39.es/ecma262/#sec-iteratorvalue">IteratorValue</a></emu-xref>(<var>next</var>).</li><li>Let <var>key</var> be <emu-xref aoid="Completion" id="_ref_20"><a href="https://tc39.es/ecma262/#sec-completion-record-specification-type">Completion</a></emu-xref>(<emu-xref aoid="Call" id="_ref_21"><a href="https://tc39.es/ecma262/#sec-call">Call</a></emu-xref>(<var>callbackfn</var>, <var>thisArg</var>, « <var>value</var>, <emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>) »)).</li><li>IfAbruptCloseIterator(<var>key</var>, <var>iteratorRecord</var>).</li><li>If <var>coercion</var> is <emu-const>property</emu-const>, then<ol><li>Set <var>key</var> to <emu-xref aoid="Completion" id="_ref_22"><a href="https://tc39.es/ecma262/#sec-completion-record-specification-type">Completion</a></emu-xref>(<emu-xref aoid="ToPropertyKey" id="_ref_23"><a href="https://tc39.es/ecma262/#sec-topropertykey">ToPropertyKey</a></emu-xref>(<var>key</var>)).</li><li>IfAbruptCloseIterator(<var>key</var>, <var>iteratorRecord</var>).</li></ol></li><li>Perform <emu-xref aoid="AddValueToKeyedGroup" id="_ref_24"><a href="#sec-add-value-to-keyed-group">AddValueToKeyedGroup</a></emu-xref>(<var>groups</var>, <var>key</var>, <var>value</var>).</li><li>Set <var>k</var> to <var>k</var> + 1.</li></ol></li></ol></li><li>NOTE: <var>items</var> is not an Iterable so assume it is an <emu-xref href="#sec-lengthofarraylike"><a href="https://tc39.es/ecma262/#sec-lengthofarraylike">array-like object</a></emu-xref>.</li><li>Let <var>arrayLike</var> be !&nbsp;<emu-xref aoid="ToObject" id="_ref_25"><a href="https://tc39.es/ecma262/#sec-toobject">ToObject</a></emu-xref>(<var>items</var>).</li><li>Let <var>len</var> be ?&nbsp;<emu-xref aoid="LengthOfArrayLike" id="_ref_26"><a href="https://tc39.es/ecma262/#sec-lengthofarraylike">LengthOfArrayLike</a></emu-xref>(<var>arrayLike</var>).</li><li>Let <var>k</var> be 0.</li><li>Repeat, while <var>k</var> &lt; <var>len</var><ol><li>Let <var>Pk</var> be !&nbsp;<emu-xref aoid="ToString" id="_ref_27"><a href="https://tc39.es/ecma262/#sec-tostring">ToString</a></emu-xref>(<emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>)).</li><li>Let <var>value</var> be ?&nbsp;<emu-xref aoid="Get" id="_ref_28"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>arrayLike</var>, <var>Pk</var>).</li><li>Let <var>key</var> be ?&nbsp;<emu-xref aoid="Call" id="_ref_29"><a href="https://tc39.es/ecma262/#sec-call">Call</a></emu-xref>(<var>callbackfn</var>, <var>thisArg</var>, « <var>value</var>, <emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>) »).</li><li>If <var>coercion</var> is <emu-const>property</emu-const>, then<ol><li>Set <var>key</var> to ?&nbsp;<emu-xref aoid="ToPropertyKey" id="_ref_30"><a href="https://tc39.es/ecma262/#sec-topropertykey">ToPropertyKey</a></emu-xref>(<var>key</var>).</li></ol></li><li>Perform <emu-xref aoid="AddValueToKeyedGroup" id="_ref_31"><a href="#sec-add-value-to-keyed-group">AddValueToKeyedGroup</a></emu-xref>(<var>groups</var>, <var>key</var>, <var>value</var>).</li><li>Set <var>k</var> to <var>k</var> + 1.</li></ol></li><li>Return <var>groups</var>.</li></ol></emu-alg>
+    <emu-alg><ol><li>If <emu-xref aoid="IsCallable" id="_ref_12"><a href="https://tc39.es/ecma262/#sec-iscallable">IsCallable</a></emu-xref>(<var>callbackfn</var>) is <emu-val>false</emu-val>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Let <var>groups</var> be a new empty <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref>.</li><li>Let <var>usingIterator</var> be ?&nbsp;<emu-xref aoid="GetMethod" id="_ref_13"><a href="https://tc39.es/ecma262/#sec-getmethod">GetMethod</a></emu-xref>(<var>items</var>, @@iterator).</li><li>If <var>usingIterator</var> is not <emu-val>undefined</emu-val>, then<ol><li>Let <var>iteratorRecord</var> be ?&nbsp;<emu-xref aoid="GetIterator" id="_ref_14"><a href="https://tc39.es/ecma262/#sec-getiterator">GetIterator</a></emu-xref>(<var>items</var>, <emu-const>sync</emu-const>, <var>usingIterator</var>).</li><li>Let <var>k</var> be 0.</li><li>Repeat,<ol><li>If <var>k</var> ≥ 2<sup>53</sup> - 1, then<ol><li>Let <var>error</var> be <emu-xref aoid="ThrowCompletion" id="_ref_15"><a href="https://tc39.es/ecma262/#sec-throwcompletion">ThrowCompletion</a></emu-xref>(a newly created <emu-val>TypeError</emu-val> object).</li><li>Return ?&nbsp;<emu-xref aoid="IteratorClose" id="_ref_16"><a href="https://tc39.es/ecma262/#sec-iteratorclose">IteratorClose</a></emu-xref>(<var>iteratorRecord</var>, <var>error</var>).</li></ol></li><li>Let <var>Pk</var> be !&nbsp;<emu-xref aoid="ToString" id="_ref_17"><a href="https://tc39.es/ecma262/#sec-tostring">ToString</a></emu-xref>(<emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>)).</li><li>Let <var>next</var> be ?&nbsp;<emu-xref aoid="IteratorStep" id="_ref_18"><a href="https://tc39.es/ecma262/#sec-iteratorstep">IteratorStep</a></emu-xref>(<var>iteratorRecord</var>).</li><li>If <var>next</var> is <emu-val>false</emu-val>, then<ol><li>Return <var>groups</var>.</li></ol></li><li>Let <var>value</var> be ?&nbsp;<emu-xref aoid="IteratorValue" id="_ref_19"><a href="https://tc39.es/ecma262/#sec-iteratorvalue">IteratorValue</a></emu-xref>(<var>next</var>).</li><li>Let <var>key</var> be <emu-xref aoid="Completion" id="_ref_20"><a href="https://tc39.es/ecma262/#sec-completion-record-specification-type">Completion</a></emu-xref>(<emu-xref aoid="Call" id="_ref_21"><a href="https://tc39.es/ecma262/#sec-call">Call</a></emu-xref>(<var>callbackfn</var>, <var>thisArg</var>, « <var>value</var>, <emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>) »)).</li><li>IfAbruptCloseIterator(<var>key</var>, <var>iteratorRecord</var>).</li><li>If <var>coercion</var> is <emu-const>property</emu-const>, then<ol><li>Set <var>key</var> to <emu-xref aoid="Completion" id="_ref_22"><a href="https://tc39.es/ecma262/#sec-completion-record-specification-type">Completion</a></emu-xref>(<emu-xref aoid="ToPropertyKey" id="_ref_23"><a href="https://tc39.es/ecma262/#sec-topropertykey">ToPropertyKey</a></emu-xref>(<var>key</var>)).</li><li>IfAbruptCloseIterator(<var>key</var>, <var>iteratorRecord</var>).</li></ol></li><li>Perform <emu-xref aoid="AddValueToKeyedGroup" id="_ref_24"><a href="#sec-add-value-to-keyed-group">AddValueToKeyedGroup</a></emu-xref>(<var>groups</var>, <var>key</var>, <var>value</var>).</li><li>Set <var>k</var> to <var>k</var> + 1.</li></ol></li></ol></li><li>NOTE: <var>items</var> is not an Iterable so assume it is an <emu-xref href="#sec-lengthofarraylike"><a href="https://tc39.es/ecma262/#sec-lengthofarraylike">array-like object</a></emu-xref>.</li><li>Let <var>arrayLike</var> be ?&nbsp;<emu-xref aoid="ToObject" id="_ref_25"><a href="https://tc39.es/ecma262/#sec-toobject">ToObject</a></emu-xref>(<var>items</var>).</li><li>Let <var>len</var> be ?&nbsp;<emu-xref aoid="LengthOfArrayLike" id="_ref_26"><a href="https://tc39.es/ecma262/#sec-lengthofarraylike">LengthOfArrayLike</a></emu-xref>(<var>arrayLike</var>).</li><li>Let <var>k</var> be 0.</li><li>Repeat, while <var>k</var> &lt; <var>len</var><ol><li>Let <var>Pk</var> be !&nbsp;<emu-xref aoid="ToString" id="_ref_27"><a href="https://tc39.es/ecma262/#sec-tostring">ToString</a></emu-xref>(<emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>)).</li><li>Let <var>value</var> be ?&nbsp;<emu-xref aoid="Get" id="_ref_28"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>arrayLike</var>, <var>Pk</var>).</li><li>Let <var>key</var> be ?&nbsp;<emu-xref aoid="Call" id="_ref_29"><a href="https://tc39.es/ecma262/#sec-call">Call</a></emu-xref>(<var>callbackfn</var>, <var>thisArg</var>, « <var>value</var>, <emu-xref href="#𝔽"><a href="https://tc39.es/ecma262/#𝔽">𝔽</a></emu-xref>(<var>k</var>) »).</li><li>If <var>coercion</var> is <emu-const>property</emu-const>, then<ol><li>Set <var>key</var> to ?&nbsp;<emu-xref aoid="ToPropertyKey" id="_ref_30"><a href="https://tc39.es/ecma262/#sec-topropertykey">ToPropertyKey</a></emu-xref>(<var>key</var>).</li></ol></li><li>Perform <emu-xref aoid="AddValueToKeyedGroup" id="_ref_31"><a href="#sec-add-value-to-keyed-group">AddValueToKeyedGroup</a></emu-xref>(<var>groups</var>, <var>key</var>, <var>value</var>).</li><li>Set <var>k</var> to <var>k</var> + 1.</li></ol></li><li>Return <var>groups</var>.</li></ol></emu-alg>
   </emu-clause>
   </ins>
 
   <ins class="block">
   <emu-clause id="sec-add-value-to-keyed-group" type="abstract operation" aoid="AddValueToKeyedGroup">
-    <h1><span class="secnum">2.4</span> AddValueToKeyedGroup ( <var>groups</var>, <var>key</var>, <var>value</var> )</h1>
+    <h1><span class="secnum">3.3</span> AddValueToKeyedGroup ( <var>groups</var>, <var>key</var>, <var>value</var> )</h1>
     <p>The abstract operation AddValueToKeyedGroup takes arguments <var>groups</var> (a <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> of Records that have [[Key]] and [[Elements]] fields), <var>key</var> (an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref>), and <var>value</var> (an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref>) and returns <emu-const>unused</emu-const>. It performs the following steps when called:</p>
     <emu-alg><ol><li>For each <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { [[Key]], [[Elements]] } <var>g</var> of <var>groups</var>, do<ol><li>If <emu-xref aoid="SameValue" id="_ref_32"><a href="https://tc39.es/ecma262/#sec-samevalue">SameValue</a></emu-xref>(<var>g</var>.[[Key]], <var>key</var>) is <emu-val>true</emu-val>, then<ol><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: exactly one element of <var>groups</var> meets this criteria.</li><li>Append <var>value</var> as the last element of <var>g</var>.[[Elements]].</li><li>Return <emu-const>unused</emu-const>.</li></ol></li></ol></li><li>Let <var>group</var> be the <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { [[Key]]: <var>key</var>, [[Elements]]: « <var>value</var> » }.</li><li>Append <var>group</var> as the last element of <var>groups</var>.</li><li>Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
   </emu-clause>
diff --git a/spec.emu b/spec.emu
index 13e1cb4..87f6a6e 100644
--- a/spec.emu
+++ b/spec.emu
@@ -18,8 +18,8 @@ location: https://tc39.es/proposal-array-grouping/
   </p>
 </emu-clause>
 
-<emu-clause id="sec-properties-of-the-array-prototype-object">
-  <h1>Properties of the Array Prototype Object (<a href="https://tc39.es/ecma262/#sec-properties-of-the-array-prototype-object">22.1.3</a>)</h1>
+<emu-clause id="sec-properties-of-the-object-constructor">
+  <h1>Properties of the Object Constructor (<a href="https://tc39.es/ecma262/multipage/fundamental-objects.html#sec-properties-of-the-object-constructor">20.1.2</a>)</h1>
 
   <ins class="block">
   <emu-clause id="sec-object.groupby">
@@ -33,7 +33,7 @@ location: https://tc39.es/proposal-array-grouping/
     <p>When the `groupBy` method is called with two or three arguments, the following steps are taken:</p>
     <emu-alg>
       1. Let _C_ be the *this* value.
-      1. If IsConstructor(_C_) is *false*, throw a *TypeError* exception.
+      1. If IsConstructor(_C_) is *false*, set _C_ to %Object%.
       1. If _C_ is %Object%, let _obj_ be OrdinaryObjectCreate(*null*); else let _obj_ be ? Construct(_C_).
       1. Let _groups_ be ? GroupBy(_items_, _callbackfn_, _thisArg_, ~property~).
       1. For each Record { [[Key]], [[Elements]] } _g_ of _groups_, do
@@ -46,6 +46,10 @@ location: https://tc39.es/proposal-array-grouping/
     </emu-note>
   </emu-clause>
   </ins>
+</emu-clause>
+
+<emu-clause id="sec-properties-of-the-map-constructor">
+  <h1>Properties of the Map Constructor (<a href="https://tc39.es/ecma262/multipage/keyed-collections.html#sec-properties-of-the-map-constructor">24.1.2</a>)</h1>
 
   <ins class="block">
   <emu-clause id="sec-map.groupby">
@@ -111,7 +115,7 @@ location: https://tc39.es/proposal-array-grouping/
           1. Perform AddValueToKeyedGroup(_groups_, _key_, _value_).
           1. Set _k_ to _k_ + 1.
       1. NOTE: _items_ is not an Iterable so assume it is an array-like object.
-      1. Let _arrayLike_ be ! ToObject(_items_).
+      1. Let _arrayLike_ be ? ToObject(_items_).
       1. Let _len_ be ? LengthOfArrayLike(_arrayLike_).
       1. Let _k_ be 0.
       1. Repeat, while _k_ &lt; _len_