diff --git a/spec.html b/spec.html
index eb186a1a55a..6d7bf36cc48 100644
--- a/spec.html
+++ b/spec.html
@@ -18764,11 +18764,11 @@ <h1>Runtime Semantics: Evaluation</h1>
         <emu-grammar>PrimaryExpression : CoverParenthesizedExpressionAndArrowParameterList</emu-grammar>
         <emu-alg>
           1. Let _expr_ be the |ParenthesizedExpression| that is covered by |CoverParenthesizedExpressionAndArrowParameterList|.
-          1. Return Completion(Evaluation of _expr_).
+          1. Return ? Evaluation of _expr_.
         </emu-alg>
         <emu-grammar>ParenthesizedExpression : `(` Expression `)`</emu-grammar>
         <emu-alg>
-          1. Return Completion(Evaluation of |Expression|). This may be of type Reference.
+          1. Return ? Evaluation of |Expression|. This may be of type Reference.
         </emu-alg>
         <emu-note>
           <p>This algorithm does not apply GetValue to Evaluation of |Expression|. The principal motivation for this is so that operators such as `delete` and `typeof` may be applied to parenthesized expressions.</p>
@@ -21016,7 +21016,7 @@ <h1>Runtime Semantics: Evaluation</h1>
         HoistableDeclaration : FunctionDeclaration
       </emu-grammar>
       <emu-alg>
-        1. Return Completion(Evaluation of |FunctionDeclaration|).
+        1. Return ? Evaluation of |FunctionDeclaration|.
       </emu-alg>
       <emu-grammar>
         BreakableStatement :
@@ -21190,7 +21190,7 @@ <h1>Runtime Semantics: Evaluation</h1>
         <emu-grammar>BindingList : BindingList `,` LexicalBinding</emu-grammar>
         <emu-alg>
           1. Let _next_ be ? Evaluation of |BindingList|.
-          1. Return Completion(Evaluation of |LexicalBinding|).
+          1. Return ? Evaluation of |LexicalBinding|.
         </emu-alg>
         <emu-grammar>LexicalBinding : BindingIdentifier</emu-grammar>
         <emu-alg>
@@ -21252,7 +21252,7 @@ <h1>Runtime Semantics: Evaluation</h1>
         <emu-grammar>VariableDeclarationList : VariableDeclarationList `,` VariableDeclaration</emu-grammar>
         <emu-alg>
           1. Let _next_ be ? Evaluation of |VariableDeclarationList|.
-          1. Return Completion(Evaluation of |VariableDeclaration|).
+          1. Return ? Evaluation of |VariableDeclaration|.
         </emu-alg>
         <emu-grammar>VariableDeclaration : BindingIdentifier</emu-grammar>
         <emu-alg>
@@ -22638,7 +22638,7 @@ <h1>Runtime Semantics: Evaluation</h1>
       </emu-alg>
       <emu-grammar>CaseClause : `case` Expression `:` StatementList</emu-grammar>
       <emu-alg>
-        1. Return Completion(Evaluation of |StatementList|).
+        1. Return ? Evaluation of |StatementList|.
       </emu-alg>
       <emu-grammar>DefaultClause : `default` `:`</emu-grammar>
       <emu-alg>
@@ -22646,7 +22646,7 @@ <h1>Runtime Semantics: Evaluation</h1>
       </emu-alg>
       <emu-grammar>DefaultClause : `default` `:` StatementList</emu-grammar>
       <emu-alg>
-        1. Return Completion(Evaluation of |StatementList|).
+        1. Return ? Evaluation of |StatementList|.
       </emu-alg>
     </emu-clause>
   </emu-clause>
@@ -22744,7 +22744,7 @@ <h1>
       </emu-alg>
       <emu-grammar>LabelledItem : FunctionDeclaration</emu-grammar>
       <emu-alg>
-        1. Return Completion(Evaluation of |FunctionDeclaration|).
+        1. Return ? Evaluation of |FunctionDeclaration|.
       </emu-alg>
       <emu-grammar>
         Statement :
@@ -22762,7 +22762,7 @@ <h1>
           DebuggerStatement
       </emu-grammar>
       <emu-alg>
-        1. Return Completion(Evaluation of |Statement|).
+        1. Return ? Evaluation of |Statement|.
       </emu-alg>
       <emu-note>
         <p>The only two productions of |Statement| which have special semantics for LabelledEvaluation are |BreakableStatement| and |LabelledStatement|.</p>
@@ -22857,7 +22857,7 @@ <h1>
       </emu-alg>
       <emu-grammar>Catch : `catch` Block</emu-grammar>
       <emu-alg>
-        1. Return Completion(Evaluation of |Block|).
+        1. Return ? Evaluation of |Block|.
       </emu-alg>
       <emu-note>
         <p>No matter how control leaves the |Block| the LexicalEnvironment is always restored to its former state.</p>
@@ -23318,7 +23318,7 @@ <h1>
       <emu-grammar>FunctionBody : FunctionStatementList</emu-grammar>
       <emu-alg>
         1. Perform ? FunctionDeclarationInstantiation(_functionObject_, _argumentsList_).
-        1. Return Completion(Evaluation of |FunctionStatementList|).
+        1. Return ? Evaluation of |FunctionStatementList|.
       </emu-alg>
     </emu-clause>
 
@@ -23501,7 +23501,7 @@ <h1>
       <emu-grammar>ConciseBody : ExpressionBody</emu-grammar>
       <emu-alg>
         1. Perform ? FunctionDeclarationInstantiation(_functionObject_, _argumentsList_).
-        1. Return Completion(Evaluation of |ExpressionBody|).
+        1. Return ? Evaluation of |ExpressionBody|.
       </emu-alg>
     </emu-clause>
 
@@ -24703,7 +24703,7 @@ <h1>
       <emu-grammar>ClassStaticBlockBody : ClassStaticBlockStatementList</emu-grammar>
       <emu-alg>
         1. Perform ? FunctionDeclarationInstantiation(_functionObject_, &laquo; &raquo;).
-        1. Return Completion(Evaluation of |ClassStaticBlockStatementList|).
+        1. Return ? Evaluation of |ClassStaticBlockStatementList|.
       </emu-alg>
     </emu-clause>
 
@@ -28453,15 +28453,15 @@ <h1>Runtime Semantics: Evaluation</h1>
         </emu-alg>
         <emu-grammar>ExportDeclaration : `export` VariableStatement</emu-grammar>
         <emu-alg>
-          1. Return Completion(Evaluation of |VariableStatement|).
+          1. Return ? Evaluation of |VariableStatement|.
         </emu-alg>
         <emu-grammar>ExportDeclaration : `export` Declaration</emu-grammar>
         <emu-alg>
-          1. Return Completion(Evaluation of |Declaration|).
+          1. Return ? Evaluation of |Declaration|.
         </emu-alg>
         <emu-grammar>ExportDeclaration : `export` `default` HoistableDeclaration</emu-grammar>
         <emu-alg>
-          1. Return Completion(Evaluation of |HoistableDeclaration|).
+          1. Return ? Evaluation of |HoistableDeclaration|.
         </emu-alg>
         <emu-grammar>ExportDeclaration : `export` `default` ClassDeclaration</emu-grammar>
         <emu-alg>