diff --git a/index.html b/index.html
index 8157754..7ef0817 100644
--- a/index.html
+++ b/index.html
@@ -45,7 +45,7 @@
 			"number": "3",
 			"namespace": "<no location>",
 			"location": "",
-			"referencingIds": ["_ref_10", "_ref_20"],
+			"referencingIds": ["_ref_20"],
 			"key": "CreateRegExpStringIterator ( R, S, global, fullUnicode )"
 		}, {
 			"type": "clause",
@@ -2203,7 +2203,7 @@
 		</div>
 	</div>
 	<div id="spec-container">
-		<h1 class="version first">Stage 3 Draft / August 9, 2018</h1>
+		<h1 class="version first">Stage 3 Draft / December 7, 2018</h1>
 		<h1 class="title">String.prototype.matchAll</h1>
 
 		<ins class="block">
@@ -2213,7 +2213,7 @@ <h1><span class="secnum">1</span>String.prototype.matchAll ( <var>regexp</var> )
 	<p>Performs a regular expression match of the String representing the <emu-val>this</emu-val> value against <var>regexp</var> and returns an iterator. Each iteration result’s value is an Array object containing the results of the match, or <emu-val>null</emu-val> if the String did not match.</p>
 
 	<p>When the <code>matchAll</code> method is called, the following steps are taken:</p>
-	<emu-alg><ol><li>Let <var>O</var> be ? <emu-xref aoid="RequireObjectCoercible" id="_ref_5"><a href="https://tc39.github.io/ecma262/#sec-requireobjectcoercible">RequireObjectCoercible</a></emu-xref>(<emu-val>this</emu-val> value).</li><li>If <var>regexp</var> is neither <emu-val>undefined</emu-val> nor <emu-val>null</emu-val>, then<ol><li>Let <var>matcher</var> be ? <emu-xref aoid="GetMethod" id="_ref_6"><a href="https://tc39.github.io/ecma262/#sec-getmethod">GetMethod</a></emu-xref>(<var>regexp</var>, @@matchAll).</li><li>If <var>matcher</var> is not <emu-val>undefined</emu-val>, then<ol><li>Return ? <emu-xref aoid="Call" id="_ref_7"><a href="https://tc39.github.io/ecma262/#sec-call">Call</a></emu-xref>(<var>matcher</var>, <var>regexp</var>, « <var>O</var> »).</li></ol></li></ol></li><li>Let <var>S</var> be ? <emu-xref aoid="ToString" id="_ref_8"><a href="https://tc39.github.io/ecma262/#sec-tostring">ToString</a></emu-xref>(<var>O</var>).</li><li>Let <var>matcher</var> be ? <emu-xref aoid="RegExpCreate" id="_ref_9"><a href="https://tc39.github.io/ecma262/#sec-regexpcreate">RegExpCreate</a></emu-xref>(<var>R</var>, <code>"g"</code>).</li><li>Let <var>global</var> be <emu-val>true</emu-val>.</li><li>Let <var>fullUnicode</var> be <emu-val>false</emu-val>.</li><li>Return ! <emu-xref aoid="CreateRegExpStringIterator" id="_ref_10"><a href="#sec-createregexpstringiterator">CreateRegExpStringIterator</a></emu-xref>(<var>matcher</var>, <var>S</var>, <var>global</var>, <var>fullUnicode</var>).
+	<emu-alg><ol><li>Let <var>O</var> be ? <emu-xref aoid="RequireObjectCoercible" id="_ref_5"><a href="https://tc39.github.io/ecma262/#sec-requireobjectcoercible">RequireObjectCoercible</a></emu-xref>(<emu-val>this</emu-val> value).</li><li>If <var>regexp</var> is neither <emu-val>undefined</emu-val> nor <emu-val>null</emu-val>, then<ol><li>Let <var>matcher</var> be ? <emu-xref aoid="GetMethod" id="_ref_6"><a href="https://tc39.github.io/ecma262/#sec-getmethod">GetMethod</a></emu-xref>(<var>regexp</var>, @@matchAll).</li><li>If <var>matcher</var> is not <emu-val>undefined</emu-val>, then<ol><li>Return ? <emu-xref aoid="Call" id="_ref_7"><a href="https://tc39.github.io/ecma262/#sec-call">Call</a></emu-xref>(<var>matcher</var>, <var>regexp</var>, « <var>O</var> »).</li></ol></li></ol></li><li>Let <var>S</var> be ? <emu-xref aoid="ToString" id="_ref_8"><a href="https://tc39.github.io/ecma262/#sec-tostring">ToString</a></emu-xref>(<var>O</var>).</li><li>Let <var>rx</var> be ? <emu-xref aoid="RegExpCreate" id="_ref_9"><a href="https://tc39.github.io/ecma262/#sec-regexpcreate">RegExpCreate</a></emu-xref>(<var>regexp</var>, <code>"g"</code>).</li><li>Return ? <emu-xref aoid="Invoke" id="_ref_10"><a href="https://tc39.github.io/ecma262/#sec-invoke">Invoke</a></emu-xref>(<var>rx</var>, @@matchAll, « <var>S</var> »).
 	</li></ol></emu-alg>
 	<emu-note><span class="note">Note 1</span><div class="note-contents">The <code>matchAll</code> function is intentionally generic, it does not require that its <emu-val>this</emu-val> value be a String object. Therefore, it can be transferred to other kinds of objects for use as a method.</div></emu-note>
 	<emu-note><span class="note">Note 2</span><div class="note-contents">Similarly to <code>String.prototype.split</code>, <code>String.prototype.matchAll</code> is designed to typically act without mutating its inputs.</div></emu-note>
diff --git a/spec.emu b/spec.emu
index d88cefc..84c8b75 100644
--- a/spec.emu
+++ b/spec.emu
@@ -21,10 +21,8 @@ contributors: Jordan Harband
 			1. If _matcher_ is not *undefined*, then
 				1. Return ? Call(_matcher_, _regexp_, &laquo; _O_ &raquo;).
 		1. Let _S_ be ? ToString(_O_).
-		1. Let _matcher_ be ? RegExpCreate(_R_, `"g"`).
-		1. Let _global_ be *true*.
-		1. Let _fullUnicode_ be *false*.
-		1. Return ! CreateRegExpStringIterator(_matcher_, _S_, _global_, _fullUnicode_).
+		1. Let _rx_ be ? RegExpCreate(_regexp_, `"g"`).
+		1. Return ? Invoke(_rx_, @@matchAll, &laquo; _S_ &raquo;).
 	</emu-alg>
 	<emu-note>The `matchAll` function is intentionally generic, it does not require that its *this* value be a String object. Therefore, it can be transferred to other kinds of objects for use as a method.</emu-note>
 	<emu-note>Similarly to `String.prototype.split`, `String.prototype.matchAll` is designed to typically act without mutating its inputs.</emu-note>
diff --git a/spec.md b/spec.md
index 0f1e337..2a26f59 100644
--- a/spec.md
+++ b/spec.md
@@ -9,10 +9,8 @@ When the `matchAll` method is called, the following steps are taken:
     1. If *matcher* is not **undefined**, then
       1. Return ? [Call](call)(*matcher*, *regexp*, &laquo; *O* &raquo;).
   1. Let *S* be ? [ToString][tostring](*O*).
-  1. Let *matcher* be ? [RegExpCreate][regexp-create](*R*, `"g"`).
-  1. Let *global* be **true**.
-  1. Let *fullUnicode* be **false**.
-  1. Return ! [CreateRegExpStringIterator](#createregexpstringiterator-abstract-operation)(*matcher*, *S*, *global*, *fullUnicode*).
+  1. Let *rx* be ? [RegExpCreate][regexp-create](*regexp*, `"g"`).
+  1. Return ? [Invoke][invoke](*rx*, @@matchAll, &laquo; *S* &raquo;).
 
 Note 1: The `matchAll` function is intentionally generic, it does not require that its *this* value be a String object. Therefore, it can be transferred to other kinds of objects for use as a method.
 Note 2: Similarly to `String.prototype.split`, `String.prototype.matchAll` is designed to typically act without mutating its inputs.
@@ -171,3 +169,4 @@ This property has the attributes { [[Writable]]: **false**, [[Enumerable]]: **fa
 [tolength]: https://tc39.github.io/ecma262/#sec-tolength
 [set]: https://tc39.github.io/ecma262/#sec-set-o-p-v-throw
 [to-boolean]: https://tc39.github.io/ecma262/#sec-toboolean
+[invoke]: https://tc39.github.io/ecma262/#sec-invoke