diff --git a/README.md b/README.md
index 99fda61..66c8ca4 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
 - [Motivation](#motivation)
 - [Problem 1: %eval% does not accept objects in lieu of strings for code](#problem-1-eval-does-not-accept-objects-in-lieu-of-strings-for-code)
 - [Problem 2: Host callout does not receive type information](#problem-2-host-callout-does-not-receive-type-information)
+- [Problem 3: Host callout does not receive the full code to check](#problem-3-host-callout-does-not-receive-the-full-code-to-check)
 - [Tests](#tests)
 
 ## Status
@@ -18,7 +19,7 @@ Spec: [ecmarkup output][draft spec], [source][]
 
 ## TL;DR
 
-Allow hosts to create _code-like_ objects and change _HostEnsureCanCompileStrings( calleeRealm, parameterStrings, bodyString, direct )_ to _HostEnsureCanCompileStrings( calleeRealm, parameterStrings, bodyString, compilationType, parameterArgs, bodyArg )_.
+Allow hosts to create _code-like_ objects and change _HostEnsureCanCompileStrings( calleeRealm, parameterStrings, bodyString, direct )_ to _HostEnsureCanCompileStrings( calleeRealm, parameterStrings, bodyString, codeString, compilationType, parameterArgs, bodyArg )_.
 
 ## Motivation
 
@@ -168,6 +169,16 @@ the Function constructor arguments.
 - Requires changes to the host callout (see also below):
 - Complex host interface; Requires passing objects to the host.
 
+## Problem 3: Host callout does not receive the full code to check
+
+`HostEnsureCanCompileStrings` is called with parameters for the source code, but they're not in a unified string.
+
+### Solution
+
+This proposal updates the host callout to contain the full code string to be executed,
+and moves the callout in `CreateDynamicFunction` after the function body is
+assembled.
+
 ## Tests
 
 Related tests at
diff --git a/index.html b/index.html
index a8ec112..2fbdc60 100644
--- a/index.html
+++ b/index.html
@@ -1554,7 +1554,7 @@
 });
 
 let sdoMap = JSON.parse(`{}`);
-let biblio = JSON.parse(`{"refsByClause":{"sec-performeval":["_ref_0","_ref_1"],"sec-createdynamicfunction":["_ref_2"],"sec-host-hooks-summary":["_ref_3"]},"entries":[{"type":"op","aoid":"HostGetCodeForEval","refId":"sec-hostgetcodeforeval"},{"type":"clause","id":"sec-hostgetcodeforeval","title":"HostGetCodeForEval ( argument )","titleHTML":"HostGetCodeForEval ( <var>argument</var> )","number":"1","referencingIds":["_ref_0","_ref_3"]},{"type":"op","aoid":"HostEnsureCanCompileStrings","refId":"sec-hostensurecancompilestrings"},{"type":"clause","id":"sec-hostensurecancompilestrings","title":"HostEnsureCanCompileStrings ( calleeRealm, parameterStrings, bodyString, direct, compilationType, parameterArgs, bodyArg )","titleHTML":"HostEnsureCanCompileStrings ( <var>calleeRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <del><var>direct</var></del>, <ins><var>compilationType</var></ins>, <ins><var>parameterArgs</var></ins>, <ins><var>bodyArg</var></ins> )","number":"2","referencingIds":["_ref_1","_ref_2"]},{"type":"op","aoid":"PerformEval","refId":"sec-performeval"},{"type":"clause","id":"sec-performeval","title":"PerformEval ( x, strictCaller, direct )","titleHTML":"PerformEval ( <var>x</var>, <var>strictCaller</var>, <var>direct</var> )","number":"3"},{"type":"op","aoid":"CreateDynamicFunction","refId":"sec-createdynamicfunction"},{"type":"clause","id":"sec-createdynamicfunction","title":"CreateDynamicFunction ( constructor, newTarget, kind, parameterArgs, bodyArg )","titleHTML":"CreateDynamicFunction ( <var>constructor</var>, <var>newTarget</var>, <var>kind</var>, <var>parameterArgs</var>, <var>bodyArg</var> )","number":"4"},{"type":"clause","id":"sec-host-hooks-summary","titleHTML":"Host Hooks","number":"A.1"},{"type":"clause","id":"sec-host-layering-points","titleHTML":"Host Layering Points","number":"A"}]}`);
+let biblio = JSON.parse(`{"refsByClause":{"sec-performeval":["_ref_0","_ref_1"],"sec-createdynamicfunction":["_ref_2","_ref_3"],"sec-host-hooks-summary":["_ref_4"]},"entries":[{"type":"op","aoid":"HostGetCodeForEval","refId":"sec-hostgetcodeforeval"},{"type":"clause","id":"sec-hostgetcodeforeval","title":"HostGetCodeForEval ( argument )","titleHTML":"HostGetCodeForEval ( <var>argument</var> )","number":"1","referencingIds":["_ref_0","_ref_4"]},{"type":"op","aoid":"HostEnsureCanCompileStrings","refId":"sec-hostensurecancompilestrings"},{"type":"clause","id":"sec-hostensurecancompilestrings","title":"HostEnsureCanCompileStrings ( calleeRealm, parameterStrings, bodyString, direct, codeString, compilationType, parameterArgs, bodyArg )","titleHTML":"HostEnsureCanCompileStrings ( <var>calleeRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <del><var>direct</var></del>, <ins><var>codeString</var></ins>, <ins><var>compilationType</var></ins>, <ins><var>parameterArgs</var></ins>, <ins><var>bodyArg</var></ins> )","number":"2","referencingIds":["_ref_1","_ref_2","_ref_3"]},{"type":"op","aoid":"PerformEval","refId":"sec-performeval"},{"type":"clause","id":"sec-performeval","title":"PerformEval ( x, strictCaller, direct )","titleHTML":"PerformEval ( <var>x</var>, <var>strictCaller</var>, <var>direct</var> )","number":"3"},{"type":"op","aoid":"CreateDynamicFunction","refId":"sec-createdynamicfunction"},{"type":"clause","id":"sec-createdynamicfunction","title":"CreateDynamicFunction ( constructor, newTarget, kind, parameterArgs, bodyArg )","titleHTML":"CreateDynamicFunction ( <var>constructor</var>, <var>newTarget</var>, <var>kind</var>, <var>parameterArgs</var>, <var>bodyArg</var> )","number":"4"},{"type":"clause","id":"sec-host-hooks-summary","titleHTML":"Host Hooks","number":"A.1"},{"type":"clause","id":"sec-host-layering-points","titleHTML":"Host Layering Points","number":"A"}]}`);
 ;let usesMultipage = false</script><style>/* IBM Plex fonts (Latin subset) have been downloaded from Google Fonts and modified to add support back in for the `zero` substitution (slashed zeroes) */
 
 /* https://fonts.googleapis.com/css2?family=IBM%20Plex%20Serif:ital,wght@0,400;0,700;1,400;1,700&display=swap */
@@ -2999,7 +2999,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" width="54" height="54">
       <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" class="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<button class="unpin-all">clear</button></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-hostgetcodeforeval" title="HostGetCodeForEval ( argument )"><span class="secnum">1</span> HostGetCodeForEval ( <var>argument</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-hostensurecancompilestrings" title="HostEnsureCanCompileStrings ( calleeRealm, parameterStrings, bodyString, direct, compilationType, parameterArgs, bodyArg )"><span class="secnum">2</span> HostEnsureCanCompileStrings ( <var>calleeRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <del><var>direct</var></del>, <ins><var>compilationType</var></ins>, <ins><var>parameterArgs</var></ins>, <ins><var>bodyArg</var></ins> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-performeval" title="PerformEval ( x, strictCaller, direct )"><span class="secnum">3</span> PerformEval ( <var>x</var>, <var>strictCaller</var>, <var>direct</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-createdynamicfunction" title="CreateDynamicFunction ( constructor, newTarget, kind, parameterArgs, bodyArg )"><span class="secnum">4</span> CreateDynamicFunction ( <var>constructor</var>, <var>newTarget</var>, <var>kind</var>, <var>parameterArgs</var>, <var>bodyArg</var> )</a></li><li><span class="item-toggle">+</span><a href="#sec-host-layering-points" title="Host Layering Points"><span class="secnum">A</span> Host Layering Points</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-host-hooks-summary" title="Host Hooks"><span class="secnum">A.1</span> Host Hooks</a></li></ol></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 3 Draft / April 15, 2024</h1><h1 class="title">Dynamic Code Brand Checks</h1>
+    </svg></div><div id="menu-spacer" class="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<button class="unpin-all">clear</button></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-hostgetcodeforeval" title="HostGetCodeForEval ( argument )"><span class="secnum">1</span> HostGetCodeForEval ( <var>argument</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-hostensurecancompilestrings" title="HostEnsureCanCompileStrings ( calleeRealm, parameterStrings, bodyString, direct, codeString, compilationType, parameterArgs, bodyArg )"><span class="secnum">2</span> HostEnsureCanCompileStrings ( <var>calleeRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <del><var>direct</var></del>, <ins><var>codeString</var></ins>, <ins><var>compilationType</var></ins>, <ins><var>parameterArgs</var></ins>, <ins><var>bodyArg</var></ins> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-performeval" title="PerformEval ( x, strictCaller, direct )"><span class="secnum">3</span> PerformEval ( <var>x</var>, <var>strictCaller</var>, <var>direct</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-createdynamicfunction" title="CreateDynamicFunction ( constructor, newTarget, kind, parameterArgs, bodyArg )"><span class="secnum">4</span> CreateDynamicFunction ( <var>constructor</var>, <var>newTarget</var>, <var>kind</var>, <var>parameterArgs</var>, <var>bodyArg</var> )</a></li><li><span class="item-toggle">+</span><a href="#sec-host-layering-points" title="Host Layering Points"><span class="secnum">A</span> Host Layering Points</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-host-hooks-summary" title="Host Hooks"><span class="secnum">A.1</span> Host Hooks</a></li></ol></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 3 Draft / May 7, 2024</h1><h1 class="title">Dynamic Code Brand Checks</h1>
 
 <emu-clause id="sec-hostgetcodeforeval" type="host-defined abstract operation" aoid="HostGetCodeForEval">
   <h1><span class="secnum">1</span> HostGetCodeForEval ( <var>argument</var> )</h1>
@@ -3012,15 +3012,16 @@ <h1><span class="secnum">1</span> HostGetCodeForEval ( <var>argument</var> )</h1
 </emu-clause>
 
 <emu-clause id="sec-hostensurecancompilestrings" type="host-defined abstract operation" aoid="HostEnsureCanCompileStrings">
-<h1><span class="secnum">2</span> HostEnsureCanCompileStrings ( <var>calleeRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <del><var>direct</var></del>, <ins><var>compilationType</var></ins>, <ins><var>parameterArgs</var></ins>, <ins><var>bodyArg</var></ins> )</h1>
-<p>The host-defined abstract operation HostEnsureCanCompileStrings takes arguments <var>calleeRealm</var> (a Realm Record), <var>parameterStrings</var> (a List of Strings), <var>bodyString</var> (a String), <del><var>direct</var> (a Boolean)</del>, <ins><var>compilationType</var> (<emu-const>direct-eval</emu-const>, <emu-const>indirect-eval</emu-const>, or <emu-const>function</emu-const>)</ins>, <ins><var>parameterArgs</var> (a List of ECMAScript language values)</ins>, and <ins><var>bodyArg</var> (an ECMAScript language value)</ins> and returns either a normal completion containing <emu-const>UNUSED</emu-const> or a throw completion. It allows host environments to block certain ECMAScript functions which allow developers to interpret and evaluate strings as ECMAScript code.</p>
+<h1><span class="secnum">2</span> HostEnsureCanCompileStrings ( <var>calleeRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <del><var>direct</var></del>, <ins><var>codeString</var></ins>, <ins><var>compilationType</var></ins>, <ins><var>parameterArgs</var></ins>, <ins><var>bodyArg</var></ins> )</h1>
+<p>The host-defined abstract operation HostEnsureCanCompileStrings takes arguments <var>calleeRealm</var> (a Realm Record), <var>parameterStrings</var> (a List of Strings), <var>bodyString</var> (a String), <del><var>direct</var> (a Boolean)</del>, <ins><var>codeString</var> (a String)</ins>, <ins><var>compilationType</var> (<emu-const>direct-eval</emu-const>, <emu-const>indirect-eval</emu-const>, or <emu-const>function</emu-const>)</ins>, <ins><var>parameterArgs</var> (a List of ECMAScript language values)</ins>, and <ins><var>bodyArg</var> (an ECMAScript language value)</ins> and returns either a normal completion containing <emu-const>UNUSED</emu-const> or a throw completion. It allows host environments to block certain ECMAScript functions which allow developers to interpret and evaluate strings as ECMAScript code.</p>
 <p>
   <var>parameterStrings</var> represents the strings that, when using one of the function constructors, will be concatenated together to build the parameters list.
   <var>bodyString</var> represents the function body or the string passed to an <code>eval</code> call.
   <del><var>direct</var> signifies whether the evaluation is a direct eval.</del>
-  <ins><var>compilationType</var> is an enum that indicates what type of compilation this is,
-  <var>parameterArgs</var> are the values passed as the leading parameters to one of the Function constructors.
-  <var>bodyArg</var> is either the final parameter passed to one of the Function constructors or the value passed to an <code>eval</code> call.</ins>
+  <ins><var>codeString</var> represents the string that will be compiled.</ins>
+  <ins><var>compilationType</var> is an enum that indicates what type of compilation this is.</ins>
+  <ins><var>parameterArgs</var> are the values passed as the leading parameters to one of the Function constructors.</ins>
+  <ins><var>bodyArg</var> is either the final parameter passed to one of the Function constructors or the value passed to an <code>eval</code> call.</ins>
 </p>
 <p>The default implementation of HostEnsureCanCompileStrings is to return NormalCompletion(<emu-const>UNUSED</emu-const>).</p>
 </emu-clause>
@@ -3029,13 +3030,13 @@ <h1><span class="secnum">2</span> HostEnsureCanCompileStrings ( <var>calleeRealm
 <emu-clause id="sec-performeval" type="abstract operation" oldids="sec-performeval-rules-outside-functions,sec-performeval-rules-outside-methods,sec-performeval-rules-outside-constructors" aoid="PerformEval"><span id="sec-performeval-rules-outside-constructors"></span><span id="sec-performeval-rules-outside-methods"></span><span id="sec-performeval-rules-outside-functions"></span>
 <h1><span class="secnum">3</span> PerformEval ( <var>x</var>, <var>strictCaller</var>, <var>direct</var> )</h1>
 <p>The abstract operation PerformEval takes arguments <var>x</var> (an ECMAScript language value), <var>strictCaller</var> (a Boolean), and <var>direct</var> (<emu-const>direct-eval</emu-const> or <emu-const>indirect-eval</emu-const>) and returns either a normal completion containing an ECMAScript language value or a throw completion. It performs the following steps when called:</p>
-<emu-alg><ol><li>Assert: If <var>direct</var> is <emu-const>indirect-eval</emu-const>, then <var>strictCaller</var> is also <emu-val>false</emu-val>.</li><li><ins>If <var>x</var> is a String, then</ins><ol><li><ins>Let <var>xStr</var> be <var>x</var>.</ins></li></ol></li><li><ins>Else if <var>x</var> is an Object, then</ins><ol><li><ins>Let <var>code</var> be <emu-xref aoid="HostGetCodeForEval" id="_ref_0"><a href="#sec-hostgetcodeforeval">HostGetCodeForEval</a></emu-xref>(<var>x</var>).</ins></li><li><ins>If <var>code</var> is a String, let <var>xStr</var> be <var>code</var>.</ins></li><li><ins>Else, return <var>x</var>.</ins></li></ol></li><li><ins>Else,</ins><ol><li><ins>Return <var>x</var>.</ins></li></ol></li><li><del>If <var>x</var> is not a String, return <var>x</var>.</del></li><li><ins>If <var>x</var> is an Object and !&nbsp;IsCodeLike(<var>x</var>) is <emu-val>true</emu-val>, then</ins><ol><li><ins>Let <var>xStr</var> be ?&nbsp;ToString(<var>x</var>).</ins></li></ol></li><li><ins>Else, if <var>x</var> is a String, then</ins><ol><li><ins>Let <var>xStr</var> be <var>x</var>.</ins></li></ol></li><li><ins>Else,</ins><ol><li><ins>Return <var>x</var>.</ins></li></ol></li><li>Let <var>evalRealm</var> be the current Realm Record.</li><li>NOTE: In the case of a direct eval, <var>evalRealm</var> is the realm of both the caller of <code>eval</code> and of the <code>eval</code> function itself.</li><li>Perform ?&nbsp;<emu-xref aoid="HostEnsureCanCompileStrings" id="_ref_1"><a href="#sec-hostensurecancompilestrings">HostEnsureCanCompileStrings</a></emu-xref>(<var>evalRealm</var>, «&nbsp;», <del><var>x</var></del> <ins><var>xStr</var>,</ins> <var>direct</var><ins>, «&nbsp;», <var>x</var></ins>).<br></li><li>...</li></ol></emu-alg>
+<emu-alg><ol><li>Assert: If <var>direct</var> is <emu-const>indirect-eval</emu-const>, then <var>strictCaller</var> is also <emu-val>false</emu-val>.</li><li><ins>If <var>x</var> is a String, then</ins><ol><li><ins>Let <var>xStr</var> be <var>x</var>.</ins></li></ol></li><li><ins>Else if <var>x</var> is an Object, then</ins><ol><li><ins>Let <var>code</var> be <emu-xref aoid="HostGetCodeForEval" id="_ref_0"><a href="#sec-hostgetcodeforeval">HostGetCodeForEval</a></emu-xref>(<var>x</var>).</ins></li><li><ins>If <var>code</var> is a String, let <var>xStr</var> be <var>code</var>.</ins></li><li><ins>Else, return <var>x</var>.</ins></li></ol></li><li><ins>Else,</ins><ol><li><ins>Return <var>x</var>.</ins></li></ol></li><li><del>If <var>x</var> is not a String, return <var>x</var>.</del></li><li><ins>If <var>x</var> is an Object and !&nbsp;IsCodeLike(<var>x</var>) is <emu-val>true</emu-val>, then</ins><ol><li><ins>Let <var>xStr</var> be ?&nbsp;ToString(<var>x</var>).</ins></li></ol></li><li><ins>Else, if <var>x</var> is a String, then</ins><ol><li><ins>Let <var>xStr</var> be <var>x</var>.</ins></li></ol></li><li><ins>Else,</ins><ol><li><ins>Return <var>x</var>.</ins></li></ol></li><li>Let <var>evalRealm</var> be the current Realm Record.</li><li>NOTE: In the case of a direct eval, <var>evalRealm</var> is the realm of both the caller of <code>eval</code> and of the <code>eval</code> function itself.</li><li>Perform ?&nbsp;<emu-xref aoid="HostEnsureCanCompileStrings" id="_ref_1"><a href="#sec-hostensurecancompilestrings">HostEnsureCanCompileStrings</a></emu-xref>(<var>evalRealm</var>, «&nbsp;», <del><var>x</var></del> <ins><var>xStr</var>, <var>xStr</var>,</ins> <var>direct</var><ins>, «&nbsp;», <var>x</var></ins>).<br></li><li>...</li></ol></emu-alg>
 </emu-clause>
 
 <emu-clause id="sec-createdynamicfunction" type="abstract operation" oldids="table-dynamic-function-sourcetext-prefixes" aoid="CreateDynamicFunction"><span id="table-dynamic-function-sourcetext-prefixes"></span>
   <h1><span class="secnum">4</span> CreateDynamicFunction ( <var>constructor</var>, <var>newTarget</var>, <var>kind</var>, <var>parameterArgs</var>, <var>bodyArg</var> )</h1>
   <p>The abstract operation CreateDynamicFunction takes arguments <var>constructor</var> (a constructor), <var>newTarget</var> (a constructor), <var>kind</var> (<emu-const>normal</emu-const>, <emu-const>generator</emu-const>, <emu-const>async</emu-const>, or <emu-const>async-generator</emu-const>), <var>parameterArgs</var> (a List of ECMAScript language values), and <var>bodyArg</var> (an ECMAScript language value) and returns either a normal completion containing an ECMAScript function object or a throw completion. <var>constructor</var> is the constructor function that is performing this action. <var>newTarget</var> is the constructor that <code>new</code> was initially applied to. <var>parameterArgs</var> and <var>bodyArg</var> reflect the argument values that were passed to <var>constructor</var>. It performs the following steps when called:</p>
-  <emu-alg><ol><li>If <var>newTarget</var> is <emu-val>undefined</emu-val>, set <var>newTarget</var> to <var>constructor</var>.</li><li>If <var>kind</var> is <emu-const>normal</emu-const>, then<ol><li>Let <var>prefix</var> be <emu-val>"function"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>FunctionExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt params="~Yield, ~Await">FunctionBody<emu-mods><emu-params>[~Yield, ~Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="~Yield, ~Await">FormalParameters<emu-mods><emu-params>[~Yield, ~Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%Function.prototype%"</emu-val>.</li></ol></li><li>Else if <var>kind</var> is <emu-const>generator</emu-const>, then<ol><li>Let <var>prefix</var> be <emu-val>"function*"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>GeneratorExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt>GeneratorBody</emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="+Yield, ~Await">FormalParameters<emu-mods><emu-params>[+Yield, ~Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%GeneratorFunction.prototype%"</emu-val>.</li></ol></li><li>Else if <var>kind</var> is <emu-const>async</emu-const>, then<ol><li>Let <var>prefix</var> be <emu-val>"async function"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>AsyncFunctionExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt>AsyncFunctionBody</emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="~Yield, +Await">FormalParameters<emu-mods><emu-params>[~Yield, +Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%AsyncFunction.prototype%"</emu-val>.</li></ol></li><li>Else,<ol><li>Assert: <var>kind</var> is <emu-const>async-generator</emu-const>.</li><li>Let <var>prefix</var> be <emu-val>"async function*"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>AsyncGeneratorExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt>AsyncGeneratorBody</emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="+Yield, +Await">FormalParameters<emu-mods><emu-params>[+Yield, +Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%AsyncGeneratorFunction.prototype%"</emu-val>.</li></ol></li><li>Let <var>argCount</var> be the number of elements in <var>parameterArgs</var>.</li><li>Let <var>parameterStrings</var> be a new empty List.</li><li>For each element <var>arg</var> of <var>parameterArgs</var>, do<ol><li>Append ?&nbsp;ToString(<var>arg</var>) to <var>parameterStrings</var>.</li></ol></li><li>Let <var>bodyString</var> be ?&nbsp;ToString(<var>bodyArg</var>).</li><li>Let <var>currentRealm</var> be the current Realm Record.</li><li>Perform ?&nbsp;<emu-xref aoid="HostEnsureCanCompileStrings" id="_ref_2"><a href="#sec-hostensurecancompilestrings">HostEnsureCanCompileStrings</a></emu-xref>(<var>currentRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <del><emu-val>false</emu-val></del><ins> <emu-const>function</emu-const>, <var>parameterArgs</var>, <var>bodyArg</var></ins>).</li><li>...</li></ol></emu-alg>
+  <emu-alg><ol><li>If <var>newTarget</var> is <emu-val>undefined</emu-val>, set <var>newTarget</var> to <var>constructor</var>.</li><li>If <var>kind</var> is <emu-const>normal</emu-const>, then<ol><li>Let <var>prefix</var> be <emu-val>"function"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>FunctionExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt params="~Yield, ~Await">FunctionBody<emu-mods><emu-params>[~Yield, ~Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="~Yield, ~Await">FormalParameters<emu-mods><emu-params>[~Yield, ~Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%Function.prototype%"</emu-val>.</li></ol></li><li>Else if <var>kind</var> is <emu-const>generator</emu-const>, then<ol><li>Let <var>prefix</var> be <emu-val>"function*"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>GeneratorExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt>GeneratorBody</emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="+Yield, ~Await">FormalParameters<emu-mods><emu-params>[+Yield, ~Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%GeneratorFunction.prototype%"</emu-val>.</li></ol></li><li>Else if <var>kind</var> is <emu-const>async</emu-const>, then<ol><li>Let <var>prefix</var> be <emu-val>"async function"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>AsyncFunctionExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt>AsyncFunctionBody</emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="~Yield, +Await">FormalParameters<emu-mods><emu-params>[~Yield, +Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%AsyncFunction.prototype%"</emu-val>.</li></ol></li><li>Else,<ol><li>Assert: <var>kind</var> is <emu-const>async-generator</emu-const>.</li><li>Let <var>prefix</var> be <emu-val>"async function*"</emu-val>.</li><li>Let <var>exprSym</var> be the grammar symbol <emu-nt>AsyncGeneratorExpression</emu-nt>.</li><li>Let <var>bodySym</var> be the grammar symbol <emu-nt>AsyncGeneratorBody</emu-nt>.</li><li>Let <var>parameterSym</var> be the grammar symbol <emu-nt params="+Yield, +Await">FormalParameters<emu-mods><emu-params>[+Yield, +Await]</emu-params></emu-mods></emu-nt>.</li><li>Let <var>fallbackProto</var> be <emu-val>"%AsyncGeneratorFunction.prototype%"</emu-val>.</li></ol></li><li>Let <var>argCount</var> be the number of elements in <var>parameterArgs</var>.</li><li>Let <var>parameterStrings</var> be a new empty List.</li><li>For each element <var>arg</var> of <var>parameterArgs</var>, do<ol><li>Append ?&nbsp;ToString(<var>arg</var>) to <var>parameterStrings</var>.</li></ol></li><li>Let <var>bodyString</var> be ?&nbsp;ToString(<var>bodyArg</var>).</li><li>Let <var>currentRealm</var> be the current Realm Record.</li><li><del>Perform ?&nbsp;<emu-xref aoid="HostEnsureCanCompileStrings" id="_ref_2"><a href="#sec-hostensurecancompilestrings">HostEnsureCanCompileStrings</a></emu-xref>(<var>currentRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <emu-val>false</emu-val>).</del></li><li>Let <var>P</var> be the empty String.</li><li>If <var>argCount</var> &gt; 0, then<ol><li>Set <var>P</var> to <var>parameterStrings</var>[0].</li><li>Let <var>k</var> be 1.</li><li>Repeat, while <var>k</var> &lt; <var>argCount</var>,<ol><li>Let <var>nextArgString</var> be <var>parameterStrings</var>[<var>k</var>].</li><li>Set <var>P</var> to the string-concatenation of <var>P</var>, <emu-val>","</emu-val> (a comma), and <var>nextArgString</var>.</li><li>Set <var>k</var> to <var>k</var> + 1.</li></ol></li></ol></li><li>Let <var>bodyParseString</var> be the string-concatenation of 0x000A (LINE FEED), <var>bodyString</var>, and 0x000A (LINE FEED).</li><li>Let <var>sourceString</var> be the string-concatenation of <var>prefix</var>, <emu-val>" anonymous("</emu-val>, <var>P</var>, 0x000A (LINE FEED), <emu-val>") {"</emu-val>, <var>bodyParseString</var>, and <emu-val>"}"</emu-val>.</li><li><ins>Perform ?&nbsp;<emu-xref aoid="HostEnsureCanCompileStrings" id="_ref_3"><a href="#sec-hostensurecancompilestrings">HostEnsureCanCompileStrings</a></emu-xref>(<var>currentRealm</var>, <var>parameterStrings</var>, <var>bodyString</var>, <var>sourceString</var>, <emu-const>FUNCTION</emu-const>, <var>parameterArgs</var>, <var>bodyArg</var>).</ins></li><li>...</li></ol></emu-alg>
   <emu-note><span class="note">Note</span><div class="note-contents">
     <p>CreateDynamicFunction defines a <emu-val>"prototype"</emu-val> property on any function it creates whose <var>kind</var> is not <emu-const>async</emu-const> to provide for the possibility that the function will be used as a constructor.</p>
   </div></emu-note>
@@ -3045,6 +3046,6 @@ <h1><span class="secnum">4</span> CreateDynamicFunction ( <var>constructor</var>
   <h1><span class="secnum">A</span> Host Layering Points</h1>
   <emu-annex id="sec-host-hooks-summary">
     <h1><span class="secnum">A.1</span> Host Hooks</h1>
-    <p><ins><b><emu-xref aoid="HostGetCodeForEval" id="_ref_3"><a href="#sec-hostgetcodeforeval">HostGetCodeForEval</a></emu-xref>(...)</b></ins></p>
+    <p><ins><b><emu-xref aoid="HostGetCodeForEval" id="_ref_4"><a href="#sec-hostgetcodeforeval">HostGetCodeForEval</a></emu-xref>(...)</b></ins></p>
   </emu-annex>
 </emu-annex></div></body>
\ No newline at end of file
diff --git a/spec.emu b/spec.emu
index aa8908a..18f533b 100644
--- a/spec.emu
+++ b/spec.emu
@@ -34,6 +34,7 @@ contributors: Krzysztof Kotowicz, Mike Samuel, Luke Warlow
     _parameterStrings_: a List of Strings,
     _bodyString_: a String,
     <del>_direct_: a Boolean,</del>
+    <ins>_codeString_: a String,</ins>
     <ins>_compilationType_: ~direct-eval~, ~indirect-eval~, or ~function~,</ins>
     <ins>_parameterArgs_: a List of ECMAScript language values,</ins>
     <ins>_bodyArg_: an ECMAScript language value,</ins>
@@ -47,9 +48,10 @@ contributors: Krzysztof Kotowicz, Mike Samuel, Luke Warlow
   _parameterStrings_ represents the strings that, when using one of the function constructors, will be concatenated together to build the parameters list.
   _bodyString_ represents the function body or the string passed to an `eval` call.
   <del>_direct_ signifies whether the evaluation is a direct eval.</del>
-  <ins>_compilationType_ is an enum that indicates what type of compilation this is,
-  _parameterArgs_ are the values passed as the leading parameters to one of the Function constructors.
-  _bodyArg_ is either the final parameter passed to one of the Function constructors or the value passed to an `eval` call.</ins>
+  <ins>_codeString_ represents the string that will be compiled.</ins>
+  <ins>_compilationType_ is an enum that indicates what type of compilation this is.</ins>
+  <ins>_parameterArgs_ are the values passed as the leading parameters to one of the Function constructors.</ins>
+  <ins>_bodyArg_ is either the final parameter passed to one of the Function constructors or the value passed to an `eval` call.</ins>
 </p>
 <p>The default implementation of HostEnsureCanCompileStrings is to return NormalCompletion(~UNUSED~).</p>
 </emu-clause>
@@ -84,7 +86,7 @@ contributors: Krzysztof Kotowicz, Mike Samuel, Luke Warlow
     1. <ins>Return _x_.</ins>
   1. Let _evalRealm_ be the current Realm Record.
   1. NOTE: In the case of a direct eval, _evalRealm_ is the realm of both the caller of `eval` and of the `eval` function itself.
-  1. Perform ? HostEnsureCanCompileStrings(_evalRealm_, « », <del>_x_</del> <ins>_xStr_,</ins> _direct_<ins>, « », _x_</ins>).<br>
+  1. Perform ? HostEnsureCanCompileStrings(_evalRealm_, « », <del>_x_</del> <ins>_xStr_, _xStr_,</ins> _direct_<ins>, « », _x_</ins>).<br>
   1. ...
 </emu-alg>
 </emu-clause>
@@ -136,7 +138,18 @@ contributors: Krzysztof Kotowicz, Mike Samuel, Luke Warlow
       1. Append ? ToString(_arg_) to _parameterStrings_.
     1. Let _bodyString_ be ? ToString(_bodyArg_).
     1. Let _currentRealm_ be the current Realm Record.
-    1. Perform ? HostEnsureCanCompileStrings(_currentRealm_, _parameterStrings_, _bodyString_, <del>*false*</del><ins> ~function~, _parameterArgs_, _bodyArg_</ins>).
+    1. <del>Perform ? HostEnsureCanCompileStrings(_currentRealm_, _parameterStrings_, _bodyString_, *false*).</del>
+    1. Let _P_ be the empty String.
+    1. If _argCount_ > 0, then
+      1. Set _P_ to _parameterStrings_[0].
+      1. Let _k_ be 1.
+      1. Repeat, while _k_ &lt; _argCount_,
+        1. Let _nextArgString_ be _parameterStrings_[_k_].
+        1. Set _P_ to the string-concatenation of _P_, *","* (a comma), and _nextArgString_.
+        1. Set _k_ to _k_ + 1.
+    1. Let _bodyParseString_ be the string-concatenation of 0x000A (LINE FEED), _bodyString_, and 0x000A (LINE FEED).
+    1. Let _sourceString_ be the string-concatenation of _prefix_, *" anonymous("*, _P_, 0x000A (LINE FEED), *") {"*, _bodyParseString_, and *"}"*.
+    1. <ins>Perform ? HostEnsureCanCompileStrings(_currentRealm_, _parameterStrings_, _bodyString_, _sourceString_, ~FUNCTION~, _parameterArgs_, _bodyArg_).</ins>
     1. ...
   </emu-alg>
   <emu-note>