diff --git a/README.md b/README.md
index b425f91a..a92cbca3 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ that automate a user agent from a separate controlling process, but
 may also be used in such a way as to allow in-browser scripts to
 control a — possibly separate — browser.
 
-The standard is authored by the W3C [Browser Testing- and Tools
+The standard is authored by the W3C [Browser Testing and Tools
 Working Group], and has produced the following documents:
 
 * **Living Document**: https://w3c.github.io/webdriver/
@@ -46,7 +46,7 @@ Vendor status documents
 
 * [Mozilla Firefox](https://bugzilla.mozilla.org/showdependencytree.cgi?id=721859&hide_resolved=1)
 * [Microsoft Edge](https://docs.microsoft.com/en-us/microsoft-edge/webdriver#w3c-webdriver)
-* [Apple Safari](https://developer.apple.com/library/content/documentation/NetworkingInternetWeb/Conceptual/WebDriverEndpointDoc/Commands/Commands.html)
+* [Apple Safari](https://developer.apple.com/documentation/webkit/macos_webdriver_commands_for_safari_12_and_later)
 * [WebKit GTK port](http://trac.webkit.org/wiki/WebDriverStatus)
 * [Selenium IEDriverServer](https://github.com/SeleniumHQ/selenium/wiki/W3C-WebDriver-Status)
 * [Chrome](https://chromium.googlesource.com/chromium/src/+/master/docs/chromedriver_status.md)
diff --git a/index.html b/index.html
index bd35f3df..09d339da 100644
--- a/index.html
+++ b/index.html
@@ -49,14 +49,17 @@
   group: "browser-tools-testing",
   noIDLSorting: true,
   mdn: "webdriver",
-  xref: "web-platform",
+  xref: {
+    specs: ["fileapi"],
+    profile: "web-platform",
+  },
 };
 </script>
 <script src=issue.js></script>
 <style>
 /* ul.brief to create inline comma separated lists */
 ul.brief::before {
-  content: '\21D2\A0';
+  content: "\21D2\A0";
   font: 1.2em/1.45 Helvetica Neue, sans-serif;
 }
 ul.brief li { display: inline }
@@ -271,9 +274,10 @@ <h2>Nodes</h2>
   above the level of the wire protocol.
 
  <dt><dfn data-lt="remote ends|remote">Remote end</dfn>
- <dd>The remote end hosts the server side of the <a href=#protocol>protocol</a>.
-  Defining the behavior of a remote end in response to the WebDriver protocol
-  forms the largest part of this specification.
+ <dd>The remote end hosts the server side of
+  the <a href=#protocol>protocol</a>.  Defining the behavior of
+  a <a>remote end</a> in response to the WebDriver protocol forms the
+  largest part of this specification.
 </dl>
 
 <p>For <a>remote ends</a> the standard defines two broad conformance
@@ -284,12 +288,9 @@ <h2>Nodes</h2>
  <dd>Intermediary nodes are those that act as proxies, implementing
   both the <a>local end</a> and <a>remote end</a> of
   the <a href=#protocol>protocol</a>.  However they are not expected
-  to implement <a>remote end steps</a> directly. All nodes between a
-  specific <a>intermediary node</a> and a <a>local end</a> are said to
-  be <dfn data-lt="downstream node">downstream</dfn> of that
-  node. Conversely, any nodes between a specific <a>intermediary
-  node</a> and an <a>endpoint node</a> are said to
-  be <dfn data-lt="upstream node">upstream</dfn>.
+  to implement <a>remote end steps</a> directly. Nodes between
+  a specific <a>intermediary node</a> and an <a>endpoint node</a> are
+  said to be <dfn>upstream</dfn> of the <a>endpoint node</a>.
 
  <dt><dfn>Endpoint node</dfn>
  <dd>An endpoint node is the final <a>remote end</a>
@@ -303,19 +304,17 @@ <h2>Nodes</h2>
   of the wire protocol.
 
 <p>
-The <dfn>readiness state</dfn> of a <a>remote end</a>
-indicates whether it is free to accept new connections.
-It must be false if the maximum <a>active sessions</a>
-is equal to the length of the list of <a>active sessions</a>,
-or if the node is an <a>intermediary node</a>
-and is known to be in a state in which attempting to create <a>new sessions</a> would fail.
-In all other cases it must be true.
-
-<p class=example>If the <a>intermediary node</a>
- is a multiplexer that manages
- multiple <a data-lt="endpoint node">endpoint nodes</a>,
- this might indicate its ability to purvey more <a>sessions</a>,
- for example if it has hit its maximum capacity.
+The <dfn>readiness state</dfn> of a <a>remote end</a> indicates
+whether it is free to accept new connections.  It must be false if the
+implementation is an <a>endpoint node</a> and the list of <a>active
+HTTP sessions</a> is not empty, or otherwise if the <a>remote end</a> is known to
+be in a state in which attempting to create <a>new sessions</a> would
+fail. In all other cases it must be true.
+
+<p class=example>If the <a>intermediary node</a> is a multiplexer that
+ manages multiple <a data-lt="endpoint node">endpoint nodes</a>, this
+ might indicate its ability to purvey more <a>sessions</a>, for
+ example if it has hit its maximum capacity.
 </section> <!-- /Nodes -->
 
 <section>
@@ -328,7 +327,7 @@ <h2>Protocol</h2>
 <p>As this standard only defines the <a>remote end</a> protocol,
  it puts no demands to how <a>local ends</a> should be implemented.
  <a>Local ends</a> are only expected to be compatible to the extent
- that they can speak the <a>remote end</a>’s protocol;
+ that they can speak the <a>remote end</a>&apos;s protocol;
  no requirements are made upon their exposed user-facing API.
 
 <section>
@@ -346,18 +345,18 @@ <h3>Algorithms</h3>
  <dfn class="export">success</dfn> or <dfn class="export">error</dfn>.
  A <a>success</a> value has an associated <var>data</var> field
  which encapsulates the value returned,
- whereas an <a>error</a> response has an associated <a>error code</a>.
+ whereas an <a>error</a> value has an associated <a>error code</a>.
 
 <p>When calling a fallible algorithm,
  the construct “Let <var>result</var> be the result
- of <dfn data-lt="try">trying</dfn> to call <var>algorithm</var>”
+ of <dfn class="export" data-lt="try">trying</dfn> to call <var>algorithm</var>”
  is equivalent to
 
 <ol>
  <li><p>Let <var>temp</var> be the result of calling <var>algorithm</var>.
 
  <li><p>If <var>temp</var> is an <a>error</a> return <var>temp</var>,
-  otherwise let <var>result</var> be <var>temp</var>’s <var>data</var> field.
+  otherwise let <var>result</var> be <var>temp</var>&apos;s <var>data</var> field.
 </ol>
 
 <p>The result of <dfn data-lt="getting properties|getting the
@@ -374,7 +373,7 @@ <h3>Algorithms</h3>
  on <var>object</var> if that results in a value other
  than <code>undefined</code> and <var>default</var> otherwise.
 
-<p><dfn data-lt='set a property'>Setting a property</dfn> with
+<p><dfn data-lt="set a property">Setting a property</dfn> with
  arguments <var>name</var> and <var>value</var> on <var>object</var>
  is defined as being the same as calling
  <a>Object.[[\Put]]</a>(<var>name</var>, <var>value</var>) on <var>object</var>.
@@ -383,7 +382,7 @@ <h3>Algorithms</h3>
   of type JSON <a>Object</a> is defined as the result of
   calling <a>stringify</a>(<var>object</var>).
 
-<p>The result of <dfn data-lt='parsing as json'>JSON deserialization</dfn> with <var>text</var> is defined as
+<p>The result of <dfn data-lt="parsing as json">JSON deserialization</dfn> with <var>text</var> is defined as
   the result of calling <a>parse</a>(<var>text</var>).
 </section> <!-- /Algorithms -->
 
@@ -418,112 +417,113 @@ <h3>Processing model</h3>
  However the exact details of how this <a>connection</a> works
  and how it is established are out of scope.
 
-<p>After such a <a>connection</a> has been established,
- a <a>remote end</a> must run the following steps:</p>
+<p>After a <a>connection</a> is established, the <a>remote end</a> must run
+the following steps:
 
 <ol>
- <li><p><a>Read bytes</a> from the <a>connection</a> until a
-  complete <a>HTTP request</a> can be constructed from the data.
-  Let <var>request</var> be a <a>request</a> constructed from the
-  received data, according to the requirements of [[RFC7230]]. If it
-  is not possible to construct a complete <a>HTTP request</a>,
-  the <a>remote end</a> must either close the <a>connection</a>,
-  return an HTTP response with status code 500, or return
-  an <a>error</a> with <a>error code</a> <a>unknown error</a>.
+ <li><p>[=iteration/While=] the <a>connection</a> is not closed:</p>
 
- <li><p>Let <var>request match</var> be the result of the algorithm
-  to <a>match a request</a> with <var>request</var>’s
-  <a>method</a> and <a>URL</a> as arguments.
+  <ol>
+   <li><p><a>Read bytes</a> from the <a>connection</a> until a
+    complete <a>HTTP request</a> can be constructed from the data.
+    Let <var>request</var> be a <a>request</a> constructed from the
+    received data, according to the requirements of [[RFC7230]]. If it
+    is not possible to construct a complete <a>HTTP request</a>,
+    the <a>remote end</a> must either close the <a>connection</a>,
+    return an HTTP response with status code 500, or return
+    an <a>error</a> with <a>error code</a> <a>unknown error</a>.
 
- <li><p>If <var>request match</var> is of type <a>error</a>,
-  <a>send an error</a> with <var>request match</var>’s <a>error code</a>
-  and jump to step 1.
+   <li><p>Let <var>request match</var> be the result of the algorithm
+    to <a>match a request</a> with <var>request</var>&apos;s
+    <a>method</a> and <a>URL</a> as arguments.
 
-  <p>Otherwise, let <var>command</var> and <var>command parameters</var>
-   be <var>request match</var>’s data. Let <var>url variables</var> be a
-   <a>url variables</a> dictionary mapping the <var>command parameters</var>
-   to their corresponding values.
+   <li><p>If <var>request match</var> is of type <a>error</a>,
+    <a>send an error</a> with <var>request match</var>&apos;s <a>error code</a>
+    and [=iteration/continue=].
 
-  <li><p>If <var>session id</var> is among the variables defined by <var>command parameters</var>:
+    <p>Otherwise, let <var>command</var> and <var>URL variables</var>
+     be <var>request match</var>&apos;s data.
 
-   <p class=note>This condition is intended to exclude the <a>New Session</a> and <a>Status</a>
-    <a>commands</a> and any <a>extension commands</a> which do not operate on a particular <a>session</a>.
+    <li><p>Let <var>session</var> be null.
 
-  <ol>
-   <li><p>Let <var>session id</var> be the corresponding variable
-    from <var>command parameters</var>.
+    <li><p>If <var>URL variables</var> [=map/contains=] "<code>session id"</code>:
 
-   <li><p>Let the <a>current session</a> be the <a>session</a>
-    with <a data-lt="session id">ID</a> <var>session id</var>
-    in the list of <a>active sessions</a>,
-    or <a><code>null</code></a> if there is no such matching <a>session</a>.
+     <p class=note>This condition is intended to exclude the <a>New Session</a> and <a>Status</a>
+      <a>commands</a> and any <a>extension commands</a> which do not operate on a particular <a>session</a>.
 
-   <li><p>If the <a>current session</a> is <a><code>null</code></a>
-   <a>send an error</a> with <a>error code</a> <a>invalid session id</a>,
-   then jump to step 1 in this overall algorithm.
+     <ol>
+       <li><p>Let <var>session id</var> be <var>URL variables</var>["<code>session id</code>"].
 
-   <li><p>If the <a>current session</a> is not <a><code>null</code></a>:
+       <li><p>For each <var>active session</var> in the list of <a>active sessions</a>:
+       <ol>
+         <li><p>If <var>active session</var>&apos;s <a>session ID</a> is equal
+             to <var>session id</var>, then let <var>session</var>
+             be <var>active session</var>, and break.
+       </ol>
 
-    <ol>
-      <li><p>Enqueue <var>request</var>
-       in the <a>current session</a>’s <a>request queue</a>.
+       <li><p>If the <var>session</var> is <a><code>null</code></a>
+       <a>send an error</a> with <a>error code</a> <a>invalid session id</a>,
+       then [=iteration/continue=].
 
-      <li><p>Wait until the first element
-       in the <a>current session</a>’s <a>request queue</a>
-       is <var>request</var>:
+    </ol>
 
-      <li><p>Dequeue <var>request</var> from the <a>current session</a>’s <a>request queue</a>.
+    <li><p>Enqueue a task on <a>remote end</a>&apos;s <a>request queue</a> to run the following
+    steps:
 
-      <li><p>If the list of <a>active sessions</a> no longer contains the <a>current session</a>,
-       set the <a>current session</a> to <a><code>null</code></a>.
-    </ol>
-  </ol>
+    <ol>
+      <li>If <a>session</a> is no longer in the list of <a>active
+      sessions</a>, then <a>send an error</a> with <a>error code</a>
+      <a>invalid session id</a> and return.
 
- <li><p>If <var>request</var>’s <a>method</a> is POST:
+      <li><p>Let <var>parameters</var> be <a><code>null</code></a>.
 
-  <ol>
-   <li><p>Let <var>parse result</var> be the result of
-    <a>parsing as JSON</a> with <var>request</var>’s
-    <a>body</a> as the argument. If this process throws an exception,
-    return an <a>error</a> with <a>error code</a> <a>invalid
-    argument</a> and jump back to step 1 in this overall algorithm.
+      <li><p>If <var>request</var>&apos;s <a>method</a> is POST:
 
-   <li><p>If <var>parse result</var> is not an <a>Object</a>,
-    <a>send an error</a> with <a>error code</a> <a>invalid argument</a>
-    and jump back to step 1 in this overall algorithm.
+       <ol>
+        <li><p>Let <var>parse result</var> be the result of
+         <a>parsing as JSON</a> with <var>request</var>&apos;s
+         <a>body</a> as the argument. If this process throws an exception,
+         return an <a>error</a> with <a>error code</a> <a>invalid
+         argument</a> and jump back to step 1 in this overall algorithm.
 
-    <p>Otherwise, let <var>parameters</var> be <var>parse result</var>.
-  </ol>
+        <li><p>If <var>parse result</var> is not an <a>Object</a>,
+         <a>send an error</a> with <a>error code</a> <a>invalid argument</a>
+         and jump back to step 1 in this overall algorithm.
+
+         <p>Otherwise, let <var>parameters</var> be <var>parse result</var>.
+       </ol>
 
-  <p>Otherwise, let <var>parameters</var> be <a><code>null</code></a>.
+      <li><p>Let <var>navigate result</var> be the result
+       of <a>wait for navigation to complete</a> with <var>session</var>.
 
- <li><p><a>Wait for navigation to complete</a>. If this returns
-  an <a>error</a> <a data-lt="send an error">return its value</a> and
-  jump to step 1 in this overall algorithm, otherwise continue.
+      <li><p>If <var>navigate result</var> is an <a>error</a>,
+       <a>send an error</a> with <a>error code</a>
+       equal to <var>navigate result</var>&apos;s <a>error code</a>
+       and return.
 
- <li><p>Let <var>response result</var> be the return value
-  obtained by running the <a>remote end steps</a> for <var>command</var>
-  with an argument named <var>url variables</var> whose value is
-  <var>url variables</var> and an
-  additional argument named <var>parameters</var> whose value is
-  <var>parameters</var>.
+      <li><p>Let <var>response result</var> be the return value
+       obtained by running the <a>remote end steps</a>
+       for <var>command</var> with <var>session</var>, <var>URL
+       variables</var>, and <var>parameters</var>.
 
- <li><p>If <var>response result</var> is an <a>error</a>,
-  <a>send an error</a> with <a>error code</a>
-  equal to <var>response result</var>’s <a>error code</a>
-  and jump back to step 1 in this overall algorithm.
+      <li><p>If <var>response result</var> is an <a>error</a>,
+       <a>send an error</a> with <a>error code</a>
+       equal to <var>response result</var>&apos;s <a>error code</a>
+       and return.
 
-  <p>Otherwise, if <var>response result</var> is a <a>success</a>,
-   let <var>response data</var> be <var>response result</var>’s data.
+       <li><p>Assert: <var>response result</var> is a <a>success</a>.
 
- <li><p><a>Send a response</a> with status 200 and <var>response data</var>.
+       <li><p>Let <var>response data</var> be <var>response result</var>&apos;s data.
 
- <li><p>Jump to step 1.
+       <li><p><a>Send a response</a> with status 200 and <var>response data</var>.
+     </ol>
+    </li>
+  </ol>
+ </li>
 </ol>
 
-<p>When required to <dfn>send an error</dfn>,
- with <var>error code</var>
- and an optional <var>error data</var> dictionary,
+<p>When required to <dfn>send an error</dfn>, with <var>error
+ code</var> and an optional <var>error data</var> dictionary,
  a <a>remote end</a> must run the following steps:</p>
 
 <ol>
@@ -566,11 +566,11 @@ <h3>Processing model</h3>
 <ol>
  <li><p>Let <var>response</var> be a new <a>response</a>.
 
- <li><p>Set <var>response</var>’s <a>HTTP status</a> to <var>status</var>,
+ <li><p>Set <var>response</var>&apos;s <a>HTTP status</a> to <var>status</var>,
   and <a>status message</a> to the string corresponding
   to the description of <var>status</var> in the <a>status code registry</a>.
 
- <li><p><a data-lt="set header">Set</a> the <var>response</var>’s <a>header</a>
+ <li><p><a data-lt="set header">Set</a> the <var>response</var>&apos;s <a>header</a>
   with <a data-lt="header name">name</a>
   and <a data-lt="header value">value</a>
   with the following values:
@@ -583,7 +583,7 @@ <h3>Processing model</h3>
    <dd>"<code>no-cache</code>"
   </dl>
 
- <li><p>Let <var>response</var>’s <a>body</a> be
+ <li><p>Let <var>response</var>&apos;s <a>body</a> be
   the <a data-lt="utf-8 encode">UTF-8 encoded</a> <a>JSON
   serialization</a> of a JSON <a>Object</a> with a key
   "<code>value</code>" set to <var>data</var>.
@@ -594,16 +594,14 @@ <h3>Processing model</h3>
  <li><p><a data-lt="write bytes">Write</a> <var>response bytes</var>
   to the <a>connection</a>.
 </ol>
-<p>A <dfn data-lt="url variables">url variable</dfn> dictionary is defined
-  as the mapping of a <a>command</a>’s <a>URI template</a> variable names
-  to their corresponding values.
+
 </section> <!-- /Processing model -->
 
 <section>
 <h3>Routing requests</h3>
 
 <p><dfn data-lt="routing requests">Request routing</dfn>
- is the process of going from a <a>HTTP request</a>
+ is the process of going from an <a>HTTP request</a>
  to the <a data-lt="remote end steps">series of steps</a> needed
  to implement the <a>command</a> represented by that request.
 
@@ -628,10 +626,10 @@ <h3>Routing requests</h3>
  <li><p>Let <var>endpoints</var> be a list
   containing each row in the <a>table of endpoints</a>.
 
- <li><p>Remove each entry from <var>endpoints</var>
-  for which the concatenation of the <a>URL prefix</a>
-  and the entry’s <a>URI template</a>
-  does not match <var>URL</var>’s <a>path</a>.
+ <li><p>Remove each entry from <var>endpoints</var> for which the
+  concatenation of the <a>URL prefix</a> and the entry&apos;s <a>URI
+  template</a> does not have a valid expansion equal to
+  <var>URL</var>&apos;s <a>path</a>.
 
  <li><p>If there are no entries in <var>endpoints</var>,
   return <a>error</a> with <a>error code</a> <a>unknown command</a>.
@@ -646,13 +644,19 @@ <h3>Routing requests</h3>
  <li><p>There is now exactly one entry in <var>endpoints</var>;
   let <var>entry</var> be this entry.
 
- <li><p>Let <var>parameters</var> be the result of extracting the variables
-  from <var>URL</var> using <var>entry</var>’s <a>URI template</a>.
+ <li><p>Let <var>URI template</var> be the concatenation of <a>URL
+ prefix</a> with <var>entry</var>&apos;s <var>URI template</var>.
 
- <li><p>Let <var>command</var> be <var>entry</var>’s <a>command</a>.
+ <li><p>Let <var>command</var> be <var>entry</var>&apos;s <a>command</a>.
+
+ <li><p>Let <var>URL variables</var> be a <a data-cite=infra>map</a> with one
+ [=map/entry=] for each variable defined in <var>URI template</var>,
+ with the entry name equal to the template variable name, and the
+ entry value being the variable value required to expand the <var>URI
+ template</var> to match <var>URL</var>&apos;s <a>path</a>.
 
  <li><p>Return <a>success</a> with data
-  <var>command</var> and <var>parameters</var>.
+  <var>command</var> and <var>URL variables</var>.
 </ol>
 </section> <!-- /Routing requests -->
 
@@ -1060,7 +1064,7 @@ <h3>Errors</h3>
 
 <aside class=example>
  <p>A <code>GET</code> request to <code>/session/1234/url</code>,
- where <code>1234</code> is not the <a>session id</a> of a <a>current session</a>
+ where <code>1234</code> is not the <a>session id</a> of a <a>session</a>
  would return an <a>HTTP response</a> with the status 404 and a body of the form:
 
  <pre><code>{
@@ -1090,7 +1094,7 @@ <h3>Errors</h3>
 }</code></pre>
 </aside>
 
-<p>The following table lists each <dfn>error code</dfn>,
+<p>The following table lists each <dfn class="export">error code</dfn>,
  its associated <a>HTTP status</a>,
  JSON <code>error</code> code,
  and a non-normative description of the error.
@@ -1155,7 +1159,7 @@ <h3>Errors</h3>
   <td><code>invalid element state</code>
   <td>A <a>command</a> could not be completed because the element is
    in an invalid state, e.g. attempting to
-   <a data-lt="Element Clear">clear</a> an element that isn’t
+   <a data-lt="Element Clear">clear</a> an element that isn&apos;t
    both <a>editable</a> and <a>resettable</a>.
  </tr>
 
@@ -1171,7 +1175,7 @@ <h3>Errors</h3>
   <td>404
   <td><code>invalid session id</code>
   <td>Occurs if the given <a>session id</a> is not in the list of <a>active sessions</a>,
-   meaning the <a>session</a> either does not exist or that it’s not active.
+   meaning the <a>session</a> either does not exist or that it&apos;s not active.
  </tr>
 
  <tr>
@@ -1185,7 +1189,7 @@ <h3>Errors</h3>
   <td><dfn>move target out of bounds</dfn>
   <td>500
   <td><code>move target out of bounds</code>
-  <td>The target for mouse interaction is not in the browser’s viewport
+  <td>The target for mouse interaction is not in the browser&apos;s viewport
    and cannot be brought into that viewport.
  </tr>
 
@@ -1203,7 +1207,7 @@ <h3>Errors</h3>
   <td><code>no such cookie</code>
   <td>No cookie matching the given path name
    was found amongst the <a>associated cookies</a>
-   of the <a>current browsing context</a>’s <a>active document</a>.
+   of <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>active document</a>.
  </tr>
 
  <tr>
@@ -1278,7 +1282,7 @@ <h3>Errors</h3>
   <td><dfn>unable to set cookie</dfn>
   <td>500
   <td><code>unable to set cookie</code>
-  <td>A <a>command</a> to set a cookie’s value could not be satisfied.
+  <td>A <a>command</a> to set a cookie&apos;s value could not be satisfied.
  </tr>
 
  <tr>
@@ -1370,7 +1374,7 @@ <h3>Extensions</h3>
 <aside class=note>
  If the <a>extension command URI Template</a> includes a variable named
  <var>session id</var>, the value of this variable will be used to define the
- <a>current session</a> during command processing.
+ <a>session</a> during command processing.
 </aside>
 
 <aside class=example>
@@ -1382,39 +1386,40 @@ <h3>Extensions</h3>
   and <code>context</code> describes the functionality
   that, in the context of Edge, allows a <a>local end</a>
   to switch between browser-specific contexts.
-  Requesting this URL will call the <a>extension command</a>’s
+  Requesting this URL will call the <a>extension command</a>&apos;s
   <a>remote end steps</a>.
 </aside>
 
 <p>Other specifications may define <dfn data-lt="additional WebDriver
 capability">additional WebDriver capabilities</dfn>. Each defined
-capability must have a <dfn>capability name</dfn> which is a string
-not containing a "<code>:</code>" (colon) character,
-an <dfn>additional capability deserialization algorithm</dfn> which is
-a set of steps taking a single argument <var>value</var> which has a
-JSON type, returning either <a>success</a> wrapping the deserialized
-capability value or <a>error</a>.
+capability must have a <dfn class=export>capability name</dfn> which
+is a string not containing a "<code>:</code>" (colon) character,
+an <dfn class=export>additional capability deserialization
+algorithm</dfn> which is a set of steps taking a single
+argument <var>value</var> which has a JSON type, returning
+either <a>success</a> wrapping the deserialized capability value
+or <a>error</a>.
 
 <p>An <a>additional WebDriver capability</a> may also define
-a <dfn>matched capability serialization algorithm</dfn>, which is a
-set of steps used to determine if a capability is matched by the
-current implementation and provide any computed value to return to the
-user. This set of steps takes a single argument <var>value</var>,
-which is the output of the corresponding <a>additional capability
-deserialization algorithm</a>, and returns
-either <a><code>null</code></a> to indicate the capability is not
-matched, or a non-null JSON-serializable value if the capability is
-matched.
-
-<p>Other specifications may also define <dfn class="export">WebDriver
-new session algorithms</dfn>, which are
-called just after a new session is created, and before the <a>new
-session</a> response is sent to the <a>remote end</a>. These
-algorithms are called with <var>session</var> representing the
-WebDriver session that will be established, and
+a <dfn class=export>matched capability serialization algorithm</dfn>,
+which is a set of steps used to determine if a capability is matched
+by the current implementation and provide any computed value to return
+to the user. This set of steps takes a single
+argument <var>value</var>, which is the output of the
+corresponding <a>additional capability deserialization algorithm</a>,
+and returns either <a><code>null</code></a> to indicate the capability
+is not matched, or a non-null JSON-serializable value if the
+capability is matched.
+
+<p>Other specifications may also define <dfn class=export>WebDriver
+new session algorithms</dfn>, which are called just after a new
+session is created, and before the <a>new session</a> response is sent
+to the <a>remote end</a>. These algorithms are called
+with <var>session</var> representing the WebDriver session that will
+be established, and
 <var>capabilities</var>, the capabilities object that will be returned
 to the <a>remote end</a>. It is permitted for such an algorithm to
-modify any entry in the capabilities object with a name that's an
+modify any entry in the capabilities object with a name that&apos;s an
 <a>additional WebDriver capability</a> defined by the same
 specification.
 
@@ -1422,7 +1427,7 @@ <h3>Extensions</h3>
  <dfn data-lt="extension capability">extension capabilities</dfn>
  that are extra <a>capabilities</a>
  used to provide configuration or fulfill other vendor-specific needs.
- Extension capabilities’ key
+ Extension capabilities&apos; key
  must contain a "<code>:</code>" (colon) character,
  denoting an implementation specific namespace.
  The value can be arbitrary JSON types.
@@ -1461,7 +1466,7 @@ <h3>Extensions</h3>
 <section>
 <h2>Capabilities</h2>
 
-<p>WebDriver <dfn data-lt="capability">capabilities</dfn>
+<p>WebDriver <dfn>capabilities</dfn>
  are used to communicate the features supported by a given implementation.
  The <a>local end</a> may use capabilities
  to define which features it requires the <a>remote end</a>
@@ -1495,21 +1500,21 @@ <h2>Capabilities</h2>
  </thead>
 
  <tr>
-  <td><dfn>Browser name</dfn>
+  <td>Browser name
   <td>"<code>browserName</code>"
   <td>string
   <td>Identifies the user agent.
  </tr>
 
  <tr>
-  <td><dfn>Browser version</dfn>
+  <td>Browser version
   <td>"<code>browserVersion</code>"
   <td>string
   <td>Identifies the version of the user agent.
  </tr>
 
  <tr>
-  <td><dfn>Platform name</dfn>
+  <td>Platform name
   <td>"<code>platformName</code>"
   <td>string
   <td>Identifies the operating system of the <a>endpoint node</a>.
@@ -1528,14 +1533,14 @@ <h2>Capabilities</h2>
   <td><dfn>Page load strategy</dfn>
   <td>"<code>pageLoadStrategy</code>"
   <td>string
-  <td>Defines the <a>current session</a>’s <a>page load strategy</a>.
+  <td>Defines the <a>session</a>&apos;s <a>page load strategy</a>.
  </tr>
 
  <tr>
   <td>Proxy configuration
   <td>"<code>proxy</code>"
   <td>JSON <a>Object</a>
-  <td>Defines the <a>current session</a>’s <a>proxy configuration</a>.
+  <td>Defines the <a>session</a>&apos;s <a>proxy configuration</a>.
  </tr>
 
  <tr>
@@ -1553,18 +1558,32 @@ <h2>Capabilities</h2>
  </tr>
 
  <tr>
-  <td><dfn>Strict file interactability</dfn>
+  <td><a>Strict file interactability</a>
   <td>"<code>strictFileInteractability</code>"
   <td>boolean
-  <td>Defines the <a>current session</a>’s <a>strict file interactability</a>.
+  <td>Defines the <a>session</a>&apos;s <a>strict file interactability</a>.
  </tr>
 
  <tr>
-  <td><dfn>Unhandled prompt behavior</dfn>
+  <td>Unhandled prompt behavior
   <td>"<code>unhandledPromptBehavior</code>"
   <td>string
-  <td>Describes the <a>current session</a>’s <a>user prompt handler</a>.
-   Defaults to the <a>dismiss and notify state</a>.
+  <td>Describes the <a>session</a>&apos;s <a>user prompt handler</a>.
+   Defaults to "<code>dismiss and notify</code>".
+ </tr>
+
+ <tr>
+  <td>User Agent
+  <td>"<code>userAgent</code>"
+  <td>string
+  <td>Identifies the <a>default User-Agent value</a> of the <a>endpoint node</a>.
+ </tr>
+
+ <tr>
+  <td>ProcessID
+  <td>"<code>processID</code>"
+  <td>string
+  <td>Identifies the main process ID of the <a>endpoint node</a>.
  </tr>
 </table>
 
@@ -1599,16 +1618,15 @@ <h3>Proxy</h3>
 </tr>
 
  <tr>
-  <td><dfn><code>proxyAutoconfigUrl</code></dfn>
+  <td><code>proxyAutoconfigUrl</code>
   <td>string
-  <td>Defines the URL for a proxy auto-config file
-   if <a><code>proxyType</code></a>
-   is equal to "<code>pac</code>".
+  <td>Defines the URL for a <a>proxy autoconfiguration</a> file
+   if <a><code>proxyType</code></a> is equal to "<code>pac</code>".
   <td>Any <a>URL</a>.
  </tr>
 
  <tr>
-  <td><dfn><code>ftpProxy</code></dfn>
+  <td><code>ftpProxy</code>
   <td>string
   <td>Defines the proxy <a>host</a> for FTP traffic when
    the <a><code>proxyType</code></a> is "<code>manual</code>".
@@ -1617,7 +1635,7 @@ <h3>Proxy</h3>
  </tr>
 
  <tr>
-  <td><dfn><code>httpProxy</code></dfn>
+  <td><code>httpProxy</code>
   <td>string
   <td>Defines the proxy <a>host</a> for HTTP traffic when
    the <a><code>proxyType</code></a> is "<code>manual</code>".
@@ -1626,7 +1644,7 @@ <h3>Proxy</h3>
  </tr>
 
  <tr>
-  <td><dfn><code>noProxy</code></dfn>
+  <td><code>noProxy</code>
   <td>array
   <td>Lists the address for which the proxy should be bypassed when
    the <a><code>proxyType</code></a> is "<code>manual</code>".
@@ -1634,7 +1652,7 @@ <h3>Proxy</h3>
  </tr>
 
  <tr>
-  <td><dfn><code>sslProxy</code></dfn>
+  <td><code>sslProxy</code>
   <td>string
   <td>Defines the proxy <a>host</a> for encrypted TLS traffic
    when the <a><code>proxyType</code></a> is "<code>manual</code>".
@@ -1643,7 +1661,7 @@ <h3>Proxy</h3>
  </tr>
 
  <tr>
-  <td><dfn><code>socksProxy</code></dfn>
+  <td><code>socksProxy</code>
   <td>string
   <td>Defines the proxy <a>host</a> for a <a>SOCKS proxy</a>
    when the <a><code>proxyType</code></a> is "<code>manual</code>".
@@ -1651,7 +1669,7 @@ <h3>Proxy</h3>
  </tr>
 
  <tr>
-  <td><dfn><code>socksVersion</code></dfn>
+  <td><code>socksVersion</code>
   <td>number
   <td>Defines the <a>SOCKS proxy</a> version
    when the <a><code>proxyType</code></a> is "<code>manual</code>".
@@ -1736,9 +1754,10 @@ <h3>Proxy</h3>
 <section>
 <h3>Processing capabilities</h3>
 
-<p>To <dfn data-lt="capabilities processing">process capabilities</dfn>
- with argument <var>parameters</var>,
- the <a>endpoint node</a> must take the following steps:
+<p>To <dfn data-lt="capabilities processing">process
+ capabilities</dfn> given <var>parameters</var>, and <a>session
+ configuration flags</a> <var>flags</var>, the <a>endpoint node</a>
+ must take the following steps:
 
 <ol>
  <li><p>Let <var>capabilities request</var> be the result of <a>getting the property</a>
@@ -1758,7 +1777,7 @@ <h3>Processing capabilities</h3>
 
    <li><p>Let <var>required capabilities</var> be the result
     of <a>trying</a> to <a>validate capabilities</a> with
-    argument <var>required capabilities</var>.
+    arguments <var>required capabilities</var> and <var>flag</var>.
   </ol>
 
  <li><p>Let <var>all first match capabilities</var> be the result of <a>getting the property</a>
@@ -1766,23 +1785,23 @@ <h3>Processing capabilities</h3>
 
   <ol>
    <li><p>If <var>all first match capabilities</var> is <a>undefined</a>,
-    set the value to a JSON <a>List</a> with a single entry of an empty JSON <a>Object</a>.
+    set the value to a <a>List</a> with a single entry of an empty JSON <a>Object</a>.
 
    <li><p>If <var>all first match capabilities</var> is not a
-   JSON <a>List</a> with one or more entries, return <a>error</a>
+   <a>List</a> with one or more entries, return <a>error</a>
    with <a>error code</a> <a>invalid argument</a>.
   </ol>
 
  <li><p>Let <var>validated first match capabilities</var> be an empty
-  JSON <a>List</a>.
+  <a>List</a>.
 
  <!-- Validate all entries first so we fail as quickly as possible -->
  <li><p>For each <var>first match capabilities</var> corresponding
   to an indexed property in <var>all first match capabilities</var>:
   <ol>
    <li><p>Let <var>validated capabilities</var> be the result
-    of <a>trying</a> to <a>validate capabilities</a> with argument
-    <var>first match capabilities</var>.
+    of <a>trying</a> to <a>validate capabilities</a> with arguments
+    <var>first match capabilities</var> and <var>flags</var>.
 
    <li><p>Append <var>validated capabilities</var> to
     <var>validated first match capabilities</var>.
@@ -1817,21 +1836,21 @@ <h3>Processing capabilities</h3>
 </ol>
 
 <p>When required to <dfn>validate capabilities</dfn> with
- argument <var>capability</var>:
+ argument <var>capabilities</var>:
 
 <ol>
- <li><p>If <var>capability</var> is not a JSON <a>Object</a> return
+ <li><p>If <var>capabilities</var> is not a JSON <a>Object</a> return
   an <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>result</var> be an empty JSON <a>Object</a>.
 
  <li><p>For each enumerable <a>own property</a>
-  in <var>capability</var>, run the following substeps:
+  in <var>capabilities</var>, run the following substeps:
   <ol>
    <li><p>Let <var>name</var> be the name of the property.
 
    <li><p>Let <var>value</var> be the result of <a>getting a
-    property</a> named <var>name</var> from <var>capability</var>.
+    property</a> named <var>name</var> from <var>capabilities</var>.
 
    <li><p>Run the substeps of the first matching condition:
     <dl class=switch>
@@ -1842,7 +1861,7 @@ <h3>Processing capabilities</h3>
      <dd><p>If <var>value</var> is not a <a>boolean</a> return
       an <a>error</a> with <a>error code</a> <a>invalid
       argument</a>. Otherwise, let <var>deserialized</var> be
-      set to <var>value</var>
+      set to <var>value</var>.
 
      <dt><var>name</var> equals "<code>browserName</code>"
      <dt><var>name</var> equals "<code>browserVersion</code>"
@@ -1869,7 +1888,8 @@ <h3>Processing capabilities</h3>
 
      <dt><var>name</var> equals "<code>timeouts</code>"
      <dd><p>Let <var>deserialized</var> be the result of <a>trying</a>
-      to <a>JSON deserialize</a> as a <a>timeouts configuration</a> the <var>value</var>.
+      to <a>deserialize as timeouts configuration</a>
+      with <var>value</var>.
 
      <dt><var>name</var> equals "<code>unhandledPromptBehavior</code>"
      <dd><p>Let <var>deserialized</var> be the result of <a>trying</a>
@@ -1959,9 +1979,11 @@ <h3>Processing capabilities</h3>
   to be impossible to match against until the browser process is started.
 </aside>
 
-<p>When <dfn>matching capabilities</dfn>
- with JSON <a>Object</a> argument <var>capabilities</var>,
- an <a>endpoint node</a> must take the following steps:
+<p>
+ When <dfn>matching capabilities</dfn> given
+ JSON <a>Object</a> <var>capabilities</var>, and a <a>session
+ configuration flags</a> <var>flags</var>, an <a>endpoint node</a>
+ must take the following steps:
 
 <ol>
  <li><p>Let <var>matched capabilities</var> be a JSON <a>Object</a>
@@ -1988,7 +2010,24 @@ <h3>Processing capabilities</h3>
     &lt;input type=file&gt;.
 
    <dt>"<code>setWindowRect</code>"
-   <dd>Boolean indicating whether the <a>remote end</a> supports all of the <a href=#resizing-and-positioning-windows>resizing and positioning</a> <a>commands</a>.
+   <dd>Boolean indicating whether the <a>remote end</a> supports all
+   of the <a href=#resizing-and-positioning-windows>resizing and
+   positioning</a> <a>commands</a>.
+
+   <dt>"<code>userAgent</code>"
+   <dd>String containing the <a>default User-Agent value</a>.
+
+   <dt>"<code>processID</code>"
+   <dd>The main PID of the user agent as a <a>number</a>.
+  </dl>
+
+ <li><p>If <var>flags</var> contains "<code>http</code>", add the
+ following entries to <var>matched capabilities</var>:
+  <dl>
+     <dt>"<code>strictFileInteractability</code>"
+     <dd><a>Boolean</a> initially set to false,
+     indicating that interactabilty checks will be applied to
+     &lt;input type=file&gt;.
   </dl>
 
  <li><p>Optionally add <a>extension capabilities</a> as entries
@@ -2011,7 +2050,7 @@ <h3>Processing capabilities</h3>
   </aside>
 
  <li><p>For each <var>name</var> and <var>value</var> corresponding
-  to <var>capability</var>’s <a>own properties</a>:
+  to <var>capabilities</var>&apos;s <a>own properties</a>:
   <ol>
   <li><p>Let <var>match value</var> equal <var>value</var>.
    <li><p>Run the substeps of the first matching <var>name</var>:
@@ -2068,7 +2107,7 @@ <h3>Processing capabilities</h3>
           <th>System
          </tr>
          <tr><td>"<code>linux</code>"</td> <td>Any server or desktop system based upon the Linux kernel.</td></tr>
-         <tr><td>"<code>mac</code>"</td> <td>Any version of Apple’s macOS.</td></tr>
+         <tr><td>"<code>mac</code>"</td> <td>Any version of Apple&apos;s macOS.</td></tr>
          <tr><td>"<code>windows</code>"</td> <td>Any version of Microsoft Windows, including desktop and mobile versions.</td></tr>
         </table>
 
@@ -2082,9 +2121,9 @@ <h3>Processing capabilities</h3>
       </div>
 
      <dt>"<code>acceptInsecureCerts</code>"
-      <dd><p>If <var>value</var> is <code>true</code>
-       and the <a>endpoint node</a> does not support <a>insecure TLS certificates</a>,
-       return <a>success</a> with data <a><code>null</code></a>.
+      <dd><p>If <a>accept insecure TLS</a> flag is set and not equal
+       to <var>value</var>, return <a>success</a> with
+       data <a><code>null</code></a>.
 
        <p class=note>If the <a>endpoint node</a> does not
         support <a>insecure TLS certificates</a> and this is the reason
@@ -2092,17 +2131,22 @@ <h3>Processing capabilities</h3>
         information to the <a>local end</a>.
 
      <dt>"<code>proxy</code>"
-     <dd><p>If the <a>endpoint node</a> does not allow the proxy it
-      uses to be configured, or if the proxy configuration defined
-      in <var>value</var> is not one that passes the <a>endpoint
-      node</a>’s implementation-specific validity checks,
-      return <a>success</a> with data <a><code>null</code></a>.
+     <dd><p>If the <a>has proxy configuration</a> flag is set, or if
+      the proxy configuration defined in <var>value</var> is not one
+      that passes the <a>endpoint node</a>&apos;s implementation-specific
+      validity checks, return <a>success</a> with
+      data <a><code>null</code></a>.
 
       <p class=note>A <a>local end</a> would only send this capability
        if it expected it to be honored and the configured proxy
        used. The intent is that if this is not possible a new session
        will not be established.
 
+     <dt>"<code>unhandledPromptBehavior</code>"
+     <dd><p>If <a>check user prompt handler matches</a>
+     with <var>value</var> is false, return <a>success</a> with
+     data <a><code>null</code></a>.
+
      <dt><strong>Otherwise</strong>
        <dd>
          <ul>
@@ -2113,7 +2157,7 @@ <h3>Processing capabilities</h3>
                 value</var> be the result of running the <a>matched
                 capability serialization algorithm</a> for
                 capability <var>name</var> with
-                argument <var>value</var>.</li>
+                arguments <var>value</var>, and <var>flags</var>.</li>
 
            <li>
              <p>Otherwise, if <var>name</var> is the key of an
@@ -2125,8 +2169,9 @@ <h3>Processing capabilities</h3>
          </ul>
     </dl>
 
-   <li><p><a>Set a property</a> on <var>matched capabilities</var>
-    with name <var>name</var> and value <var>match value</var>.
+   <li><p>If <var>match value</var> is not null, <a>set a property</a>
+    on <var>matched capabilities</var> with name <var>name</var> and
+    value <var>match value</var>.
   </ol>
 
  <li><p>Return <a>success</a> with data <var>matched capabilities</var>.
@@ -2138,29 +2183,10 @@ <h3>Processing capabilities</h3>
 <section>
 <h2>Sessions</h2>
 
-<p>A <a>session</a> is equivalent to a single instantiation of a particular user agent,
- including all its child browsers.
- WebDriver gives each <a>session</a> a unique <a>session ID</a>
- that can be used to differentiate one session from another,
- allowing multiple user agents to be controlled from a single HTTP server,
- and allowing sessions to be routed via a multiplexer
- (known as an <a>intermediary node</a>).
-
-<p>A WebDriver <dfn class="export">session</dfn> represents
- the <a>connection</a> between a <a>local end</a> and a specific <a>remote end</a>.
-
-<p>A <a>session</a> is started when
- a <a>New Session</a> is invoked.
- It is an <a>error</a> to send any commands before starting a session,
- or to continue to send commands after
- the <a>session</a> has been closed.
- Maintaining session continuity between <a>commands</a> to
- the <a>remote end</a> requires passing a <a>session ID</a>.
-
-<p>A <a>session</a> is torn down at some later point;
- either explicitly by invoking <a>Delete Session</a>,
- or implicitly when <a>Close Window</a> is called
- at the last remaining <a>top-level browsing context</a>.
+<p>A WebDriver <dfn data-lt="sessions">session</dfn> represents the
+ logical connection between a <a>local end</a> and a
+ specific <a>remote end</a>. The <a>session</a> object holds state
+ specific to that connection.
 
 <p>An <a>intermediary node</a> will maintain an <dfn>associated
  session</dfn> for each active <a>session</a>. This is
@@ -2170,28 +2196,27 @@ <h2>Sessions</h2>
  an <a>intermediary node</a> will also <a>close the session</a> of
  the <a>associated session</a>.
 
-<p>All <a>commands</a>, except <a>New Session</a> and <a>Status</a>,
- have an associated <dfn>current session</dfn>,
- which is the <a>session</a> in which that <a>command</a> will run.
+<p>A <a>session</a> has a <dfn>session ID</dfn>, which is the string
+ representation of a <a>UUID</a> used to uniquely identify the
+ session. This is set when creating the session.
+
+<p>A <a>session</a> has a boolean <dfn>HTTP flag</dfn> which is set
+when the session is created. A session with this flag set is
+an <dfn>HTTP session</dfn>.
+
+<p>A <a>remote end</a> has an associated list of
+ <dfn>active sessions</dfn>, which is a list of all <a>session</a>s
+ that are currently started.
 
 <p>A <a>remote end</a> has an associated list of
- <dfn data-lt="active session">active sessions</dfn>,
- which is a list of all <a>sessions</a> that are currently started.
- A <a>remote end</a> that is not an <a>intermediary node</a>
- has at most one <a>active session</a> at a given time.
-
-<p>A <a>remote end</a> has an associated
- <dfn>maximum active sessions</dfn> (an integer)
- that defines the number of <a>active sessions</a>
- that are supported.
- This may be “unlimited” for <a>intermediary nodes</a>,
- but must be exactly one for a <a>remote end</a> that is an <a>endpoint node</a>.
-
-<p>A <a>session</a> has an associated <dfn>session ID</dfn> (a string
- representation of a <a>UUID</a>) used to uniquely identify this
- session.  Unless stated otherwise it is <a><code>null</code></a>.
-
-<p>A <a>session</a> has an associated <dfn>current browsing
+ <dfn>active HTTP sessions</dfn>, which is a list of all <a>HTTP
+ session</a>s that are currently started.
+
+<p class=note>The limitation of a single HTTP session for <a>endpoint
+node</a>s means that the first entry in the list of <a>active HTTP
+sessions</a> will be the only entry.
+
+<p>A <a>HTTP session</a> has an associated <dfn>current browsing
  context</dfn>, which is the <a>browsing context</a> against
  which <a>commands</a> will run, an associated <dfn>current parent
  browsing context</dfn>, which is set to the parent of the <a>current
@@ -2200,57 +2225,171 @@ <h2>Sessions</h2>
  set to the top-browsing context ancestor of the <a>current browsing
  context</a>, when changing browsing contexts.</p>
 
-<p>
-A <a>session</a> has an associated <dfn data-lt="session script timeout|session page load timeout|session implicit wait timeout">session timeouts</dfn>
-that records the timeout duration values used to control the behavior
-of <a href=#executing-script>script evaluation</a>,
-<a href=#navigation>navigation</a>,
-and <a href=#elements>element retrieval</a>.
-
-<p>A <a>session</a> has an associated <dfn>page loading strategy</dfn>,
- which is one of the keywords from the <a>table of page load strategies</a>.
- Unless stated otherwise, it is <a>normal</a>.
-
-<p>A <a>session</a> has an associated <dfn>secure TLS</dfn> state
- that indicates whether untrusted or self-signed TLS certificates
- should be trusted for the duration of the WebDriver session.
- If it is unset, this indicates that certificate- or TLS errors
- that occur upon <a>navigation</a> should be suppressed.
- The state can be unset by providing
- an "<code>acceptInsecureCerts</code>" <a>capability</a> with the value true.
- Unless stated otherwise, it is set.
-
-<p>A <a>session</a> has an associated <a>strict file interactability</a>
- state which is a boolean.
+<p>An <a>HTTP session</a> has an associated <dfn>session
+timeouts</dfn> which is a <a>timeouts configuration</a>. This is
+initially set to a new <a>timeouts configuration</a>.
 
-<p>
-A <a>session</a> has an associated <a>user prompt handler</a>.
-Unless stated otherwise it is in the <a>dismiss and notify state</a>.
+<p>An <a>HTTP session</a> has an associated <dfn>page loading
+strategy</dfn>, which is one of the keywords from the <a>table of page
+load strategies</a>.  This is initially set to <a>normal</a>.
+
+<p>An <a>HTTP session</a> has an associated <dfn>strict file
+interactability</dfn> state which is a boolean. This is initially set
+to false.
 
 <p>A <a>session</a> has an associated <dfn>browsing context input
-state map</dfn>, which is a Weak Map with <a>top-level browsing
+state map</dfn>, which is a <a>weak map</a> with <a>top-level browsing
 contexts</a> as keys, and <a>input state</a> objects as values. This
 is initially set to an empty map.
 
-<p>A <a>session</a> has an associated <dfn>request queue</dfn> which is a
- [=queue=] of [=requests=] that are currently awaiting
- processing.
+<p>An <a>HTTP session</a> has an associated <dfn>request queue</dfn> which is a
+<a>queue</a> of <a data-lt=request>requests</a> that are currently awaiting
+processing.
+
+<p>When a session is created, a [=set=] of <dfn>session configuration
+flags</dfn> are provided that define the features of the session. This
+specification always creates sessions with "<code>http</code>"
+in <a>session configuration flags</a>, which corresponds to
+the <a>HTTP flag</a>. External specifications may define additional
+flags, or create sessions without the <a>HTTP flag</a>.
+
+<h3>Global State</h3>
+
+<p>In addition to per-session state, a <a>remote end</a> that is
+an <a>endpoint node</a> also has additional state that is global
+across all sessions.</p>
+
+<p>An <a>endpoint node</a> has an associated <dfn>accept insecure
+ TLS</dfn> flag that indicates whether untrusted or self-signed TLS
+ certificates are treated as trusted. The default value of the flag is
+ false if the endpoint doesn&apos;t support accepting insecure TLS
+ connections, or unset otherwise.</p>
+
+<p>An <a>endpoint node</a> has an associated <dfn>has proxy
+ configuration</dfn> flag that indicates whether the proxy is already
+ configured. The default value of the flag is true if the endpoint
+ doesn&apos;t support proxy configuration, or false otherwise.</p>
+
+<p>To <dfn>create a session</dfn>, given a JSON
+Object <var>capabilites</var>, and <a>session configuration
+flags</a> <var>flags</var>:
+<ol>
+ <li><p>Let <var>session id</var> be the result of <a>generating a UUID</a>.
+
+ <li><p>Let <var>session</var> be a new <a>session</a> with <a>session
+  ID</a> <var>session id</var>, and <a>HTTP flag</a> <var>flags</var> contains
+  "<code>http</code>".
+
+ <li><p>Let <var>proxy</var> be the result of getting property
+     "<code>proxy</code>" from <var>capabilities</var> and run the
+     substeps of the first matching statement:
+
+       <dl class=switch>
+         <dt><var>proxy</var> is a <a>proxy configuration</a> object</dt>
+         <dd><p>Take implementation-defined steps to set the user agent proxy
+             using the extracted <var>proxy</var> configuration. If the
+             defined proxy cannot be configured return <a>error</a> with
+             <a>error code</a> <a>session not created</a>. Otherwise
+             set the <a>has proxy configuration</a> flag to true.</dd>
+
+         <dt>Otherwise</dt>
+         <dd><a>Set a property</a> of <var>capabilities</var> with name
+           "<code>proxy</code>" and a value that is a new JSON <a>Object</a>.</dd>
+       </dl>
+   </li>
+
+  <li><p>If <var>capabilites</var> has a property named
+  "<code>acceptInsecureCerts</code>", set the <a>endpoint
+  node</a>&apos;s <a>accept insecure TLS</a> flag to the result
+  of <a>getting a property</a> named
+  "<code>acceptInsecureCerts</code>" from <var>capabilities</var>.
+
+  <li><p>Let <var>user prompt handler capability</var> be the result of getting property
+  "<code>unhandledPromptBehavior</code>" from <var>capabilities</var>.
+
+  <li><p>If <var>user prompt handler capability</var> is not
+   undefined, <a>update the user prompt handler</a> with <var>user
+   prompt handler capability</var>.
+
+  <li><p>Let <var>serialized user prompt handler</var>
+   be <a>serialize the user prompt handler</a>.
+
+  <li><p>Set a property on <var>capabilities</var> with the name
+   "<code>unhandledPromptBehavior</code>", and the value <var>serialized
+   user prompt handler</var>.
+
+  <li><p>If <var>flags</var> <var>contains</var> "<code>http</code>":
+      <ol>
+        <li><p>Let <var>strategy</var> be the result of getting
+        property "<code>pageLoadStrategy</code>"
+        from <var>capabilities</var>. <p>If <var>strategy</var> is a
+        string, set the <a>session</a>&apos;s <a>page loading
+        strategy</a> to <var>strategy</var>.  Otherwise, set
+        the <a>page loading strategy</a> to <i>normal</i> and <a>set a
+        property</a> of <var>capabilities</var> with name
+        "<code>pageLoadStrategy</code>" and value
+        "<code>normal</code>".</p>
+
+        <li><p>Let <var>strictFileInteractability</var> be the result
+        of getting property "<code>strictFileInteractability</code>"
+        from <var>capabilities</var>. If <var>strictFileInteractability</var>
+        is a boolean, set <a>session</a>&apos;s <a>strict file
+        interactability</a> to <var>strictFileInteractability</var>.
+
+        <li><p>Let <var>timeouts</var> be the result of getting a
+        property "<code>timeouts</code>" from <var>capabilities</var>.
+        If <var>timeouts</var> is not undefined, set
+        <var>session</var>&apos;s <a>session timeouts</a>
+        to <var>timeouts</var>.
+
+       <li><p>Set a property on <var>capabilities</var> with name
+       "<code>timeouts</code>" and value <a>serialize the timeouts
+       configuration</a> with <var>session</var>&apos;s
+       <a>session timeouts</a>.
+      </ol>
+  </li>
+
+  <li><p>Process any <a>extension capabilities</a>
+  in <var>capabilities</var> in an implementation-defined manner.</li>
+
+  <li><p>Run any <a>WebDriver new session algorithm</a> defined in
+  external specifications, with arguments <var>session</var>,
+  <var>capabilities</var>, and <var>flags</var>.
+
+  <li><p>Append <var>session</var> to <a>active sessions</a>.
 
-<p>When asked to <dfn>close the session</dfn>,
+  <li><p>If <var>flags</var> contains "<code>http</code>",
+   append <var>session</var> to <a>active HTTP sessions</a>.
+
+  <li><p>Set the <a>webdriver-active flag</a> to true.</p>
+ </ol>
+
+<p>To <dfn>close the session</dfn>, given <var>session</var>
  a <a>remote end</a> must take the following steps:
 
 <ol>
- <li><p>Perform the following substeps based on the <a>remote end</a>’s
+
+ <li><p>If <var>session</var>&apos;s <a>HTTP flag</a> is set,
+ remove <var>session</var> from <a>active HTTP sessions</a>.
+
+ <li><p>Remove <var>session</var> from <a>active sessions</a>.
+
+ <li><p>Perform the following substeps based on the <a>remote end</a>&apos;s
   type:
   <dl class=switch>
    <dt><a>Remote end</a> is an <a>endpoint node</a>
    <dd>
     <ol>
-     <li><p>Set the <a>webdriver-active flag</a> to false.
-
-     <li><p>An <a>endpoint node</a> must <a>close</a> any <a>top-level
-      browsing contexts</a> associated with the <a>session</a>,
-      without <a>prompting to unload</a>.
+     <li><p>If the list of <a>active sessions</a> is empty:
+      <ol>
+        <li><p>Set the <a>webdriver-active flag</a> to false
+        <li><p>Set the <a>user prompt handler</a> to null.
+        <li><p>Unset the <a>accept insecure TLS</a> flag.
+        <li><p>Reset the <a>has proxy configuration</a> flag to its
+        default value.
+        <li><p>Optionally, <a>close</a> all <a>top-level browsing contexts</a>,
+        without <a>prompting to unload</a>.
+      </ol>
     </ol>
   <dt><a>Remote end</a> is an <a>intermediary node</a>
   <dd>
@@ -2261,8 +2400,6 @@ <h2>Sessions</h2>
    </ol>
   </dl>
 
- <li><p>Remove the <a>current session</a> from <a>active sessions</a>.
-
  <li><p>Perform any implementation-specific cleanup steps.
 
  <li><p>If an <a>error</a> has occurred in any of the steps above,
@@ -2311,7 +2448,7 @@ <h3 id=new-session><dfn data-lt="new sessions|creating a new session">New Sessio
  <p>An <a>intermediary node</a> might require authentication
   on <a>creating a new session</a>.
   This authentication is an argument to the <a>New Session</a> command
-  itself and not the user agent’s <a>capabilities</a>.
+  itself and not the user agent&apos;s <a>capabilities</a>.
   Therefore, the authentication should be passed
   as a top-level parameter and not embedded in <code>capabilities</code>:
 
@@ -2348,12 +2485,15 @@ <h3 id=new-session><dfn data-lt="new sessions|creating a new session">New Sessio
 ]</pre>
 </aside>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
-  <li><p>If the <a>maximum active sessions</a> is equal to
-  the length of the list of <a>active sessions</a>,
-  return <a>error</a> with <a>error code</a> <a>session not created</a>.
+  <li><p>If the implementation is an <a>endpoint node</a>, and the
+  list of <a>active HTTP sessions</a> is not empty, or otherwise if
+  the implementation is unable to start an additional session,
+  return <a>error</a> with <a>error code</a> <a>session not
+  created</a>.
 
  <li><p>If the <a>remote end</a> is an <a>intermediary node</a>, take
   implementation-defined steps that either result in returning
@@ -2371,100 +2511,38 @@ <h3 id=new-session><dfn data-lt="new sessions|creating a new session">New Sessio
    <a>URL prefix</a> of the <a>upstream</a> <a>remote end</a> will need
    to be tracked.
 
- <li><p>If the <a>maximum active sessions</a> is equal to
-  the length of the list of <a>active sessions</a>,
-  return <a>error</a> with <a>error code</a> <a>session not created</a>.
+ <li><p>Let <var>flags</var> be a set containing "<code>http</code>".
 
- <li><p>Let <var>capabilities</var> be the result
-  of <a>trying</a> to <a>process capabilities</a>
-  with <var>parameters</var> as an argument.
+ <li><p>Let <var>capabilities</var> be the result of <a>trying</a>
+  to <a>process capabilities</a> with <var>parameters</var>
+  and <var>flags</var>.
 
- <li><p>If <var>capabilities</var>’s is <a><code>null</code></a>,
+ <li><p>If <var>capabilities</var>&apos;s is <a><code>null</code></a>,
   return <a>error</a> with <a>error code</a> <a>session not created</a>.
 
- <li><p>Let <var>session id</var> be the result of <a>generating a UUID</a>.
-
- <li><p>Let <var>session</var> be a new <a>session</a>
-  with the <a>session ID</a> of <var>session id</var>.
-
- <li><p>Set the <a>current session</a> to <var>session</var>.
-
- <li><p>Run any <a>WebDriver new session algorithm</a> defined in
- external specifications, with arguments <var>session</var>
- and <var>capabilities</var>.
-
- <li><p>Append <var>session</var> to <a>active sessions</a>.
+ <li><p>Let <var>session</var> be the result of <a>create a
+ session</a>, with <var>capabilities</var>, and <var>flags</var>.
 
  <li><p>Let <var>body</var> be a JSON <a>Object</a> initialized with:
 
   <dl>
    <dt>"<code>sessionId</code>"
-   <dd><var>session id</var>
+   <dd><var>session</var>&apos;s <a>session ID</a>.
 
    <dt>"<code>capabilities</code>"
    <dd><var>capabilities</var>
   </dl>
 
- <li><p>Initialize the following from <var>capabilities</var>:
-
-  <ol>
-   <li><p>Let <var>strategy</var> be the result of getting property
-    "<code>pageLoadStrategy</code>" from <var>capabilities</var>.
-
-   <li><p>If <var>strategy</var> is a string, set the <a>current session</a>’s
-    <a>page loading strategy</a> to <var>strategy</var>.  Otherwise,
-    set the <a>page loading strategy</a> to <i>normal</i> and <a>set a
-    property</a> of <var>capabilities</var> with name
-    "<code>pageLoadStrategy</code>" and value "<code>normal</code>".
-
-   <li><p>Let <var>strictFileInteractability</var> be the result of getting property
-    "<code>strictFileInteractability</code>" from <var>capabilities</var>.
-
-   <li><p>If <var>strictFileInteractability</var> is a boolean,
-    set the <a>current session</a>’s <a>strict file interactability</a> to
-    <var>strictFileInteractability</var>. Otherwise set the
-    <a>current session</a>’s <a>strict file interactability</a> to false.
-
-   <li><p>Let <var>proxy</var> be the result of getting property
-    "<code>proxy</code>" from <var>capabilities</var> and run the
-    substeps of the first matching statement:
-
-       <dl class=switch>
-         <dt><var>proxy</var> is a <a>proxy configuration</a> object</dt>
-         <dd><p>Take implementation-defined steps to set the user agent proxy
-             using the extracted <var>proxy</var> configuration.  If the
-             defined proxy cannot be configured return <a>error</a> with
-             <a>error code</a> <a>session not created</a>.</dd>
-
-         <dt>Otherwise</dt>
-         <dd><a>Set a property</a> of <var>capabilities</var> with name
-           "<code>proxy</code>" and a value that is a new JSON <a>Object</a>.</dd>
-       </dl>
-   </li>
-
-   <li><p>If <var>capabilities</var> has a property with the key "<code>timeouts</code>":
-
-    <ol>
-     <li><p>Let <var>timeouts</var> be the result of <a>trying</a>
-      to <a>JSON deserialize</a> as a <a>timeouts configuration</a>
-      the value of the "<code>timeouts</code>" property.
-
-     <li><p>Make the <a>session timeouts</a> the new <var>timeouts</var>.
-    </ol>
-
-   <li><p>Set a property on <var>capabilities</var> with name
-    "<code>timeouts</code>" and value that of the
-    <a>JSON deserialization</a> of the <a>session timeouts</a>.
-
-   <li><p>Apply changes to the user agent for any implementation-defined capabilities
-    selected during the <a>capabilities processing</a> step.
-  </ol>
-
- <li><p>Set the <a>webdriver-active flag</a> to true.</p>
-
- <li><p><a>Set the current top-level browsing context</a>
-   for <var>session</var> with the <a>top-level browsing context</a>
-   of the UA’s <a>current browsing context</a>.
+ <li><p>Set <var>session</var>&apos; <a>current top-level browsing
+   context</a> to one of the <a>endpoint node</a>&apos;s <a>top-level
+   browsing context</a>s, preferring the <a>top-level browsing
+   context</a> that
+   has <a href="https://html.spec.whatwg.org/#tlbc-system-focus">system
+   focus</a>, or otherwise preferring any <a>top-level browsing
+   context</a> whose
+   <a href="https://w3c.github.io/page-visibility/#dfn-determine-the-visibility-state">visibility
+   state</a>
+   is <a href="https://w3c.github.io/page-visibility/#dfn-visible">visible</a>.
 
   <p class="note">WebDriver implementations typically start a
    completely new browser instance, but there is no requirement in
@@ -2493,11 +2571,12 @@ <h3><dfn>Delete Session</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current session</a> is an <a>active session</a>,
-  <a>try</a> to <a>close the session</a>.
+ <li><p>If <var>session</var> is an <a>active HTTP session</a>,
+  <a>try</a> to <a>close the session</a> with <var>session</var>.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -2524,7 +2603,7 @@ <h3><dfn>Status</dfn></h3>
   but may additionally include arbitrary meta information
   that is specific to the implementation.
 
- <p>The <a>remote end</a>’s <a>readiness state</a> is represented
+ <p>The <a>remote end</a>&apos;s <a>readiness state</a> is represented
   by the <code>ready</code> property of the body,
   which is false if an attempt to <a data-lt="new session">create a session</a>
   at the current time would fail.
@@ -2538,7 +2617,8 @@ <h3><dfn>Status</dfn></h3>
  <code>ready</code> and <code>message</code>
  are reserved and must not be overwritten.
 
-<p>The <a>remote end steps</a> are:</p>
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>Let <var>body</var> be a new JSON <a>Object</a>
@@ -2546,161 +2626,116 @@ <h3><dfn>Status</dfn></h3>
 
   <dl>
    <dt>"<code>ready</code>"
-   <dd><p>The <a>remote end</a>’s <a>readiness state</a>.
+   <dd><p>The <a>remote end</a>&apos;s <a>readiness state</a>.
 
    <dt>"<code>message</code>"
    <dd><p>An implementation-defined string
-    explaining the <a>remote end</a>’s <a>readiness state</a>.
+    explaining the <a>remote end</a>&apos;s <a>readiness state</a>.
   </dl>
 
  <li><p>Return <a>success</a> with data <var>body</var>.
 </ol>
+
 </section> <!-- /Status -->
 </section> <!-- /Sessions -->
 
 <section>
 <h2>Timeouts</h2>
 
-<p>
-A <dfn>timeouts configuration</dfn> is a record
-of the different timeouts that control the behavior of
-<a href=#executing-script>script evaluation</a>,
-<a href=#navigation>navigation</a>,
-and <a href=#elements>element retrieval</a>:
+<p>A <dfn>timer</dfn> is a <a>struct</a>. It has
+a <dfn data-dfn-for=timer>timeout fired flag</dfn>, which is a
+boolean, initially false.
 
-<table class=simple>
-<tr>
-<th>Field
-<th>Default
-<th>JSON key
-<th>Optional<sup>†</sup>
-<th>Nullable
-<th>Description<sup>†</sup>
-</tr>
+<p>To <dfn>start the timer</dfn> given <var>timer</var> and <var>timeout</var>
 
-<tr>
-<td><dfn>Script timeout</dfn>
-<td>30,000
-<td>"<code>script</code>"
-<td>✓
-<td>✓
-<td>
-<p>
-Specifies when to interrupt a script that is being
-<a href=#executing-script>evaluated</a>.
+<ol class=algorithm>
 
-<p>
-A <a><code>null</code></a> value implies that scripts should never be interrupted,
-but instead run indefinitely.
-</tr>
+ <li><p>Assert: <var>timeout</var> is not null.
 
-<tr>
-<td><dfn>Page load timeout</dfn>
-<td>300,000
-<td>"<code>pageLoad</code>"
-<td>✓
-<td>
-<td>
-<p>
-Provides the timeout limit used to interrupt
-an explicit <a data-lt=navigate>navigation</a> attempt.
-</tr>
+ <li><p>Run the following steps <a>in parallel</a>:
 
-<tr>
-<td><dfn>Implicit wait timeout</dfn>
-<td>0
-<td>"<code>implicit</code>"
-<td>✓
-<td>
-<td>
-<p>
-Specifies a time to wait for the <a>element location strategy</a> to complete
-when <a href=#element-retrieval>locating an element</a>
-</tr>
-</table>
+ <ol>
 
-<!-- This should be a <figcaption>, but we can fix that later: -->
-<p style="text-align: right; font-size: 90%">
-<sup>†</sup> Informative.
+  <li><p>Wait for at least <var>timeout</var> milliseconds to pass.
 
-<p>
-The <dfn>timeouts object</dfn> for a <a>timeouts
-configuration</a> <var>timeouts</var> is an <a>object</a> initialized
-with the following properties:
+  <li><p>Set <var>timer</var>&apos;s [=timer/timeout
+  fired flag=] to true.
 
-<dl>
-<dt>"<code>script</code>"
-<dd><var>timeouts</var>' <a>script timeout</a> value, if set, or its default value.
+ </ol>
 
-<dt>"<code>pageLoad</code>"
-<dd><var>timeouts</var>' <a>page load timeout</a>’s value, if set, or its default value.
+</ol>
 
-<dt>"<code>implicit</code>"
-<dd><var>timeouts</var>' <a>implicit wait timeout</a>’s value, if set, or its default value.
-</dl>
+<p>A <dfn>timeouts configuration</dfn> is a <a>struct</a> representing
+the timeouts for <a href=#executing-script>script evaluation</a>,
+<a href=#navigation>navigation</a>, and <a href=#elements>element
+retrieval</a>. It has a <dfn data-dfn-for=timeouts>script
+timeout</dfn> [=struct/item=] which is an integer or null and is
+initially set to 30,000, a <dfn data-dfn-for=timeouts>page load
+timeout</dfn> [=struct/item=] which is an integer or null and is
+initially set to 300,000, and an <dfn data-dfn-for=timeouts>implicit
+wait timeout</dfn> [=struct/item=] which is an integer or null and is
+initially set to 0.
 
-<p>
-To <a>JSON deserialize</a> an input <var>value</var>
-into a <a>timeouts configuration</a> record:
 
-<ol>
-<li><p>
-Let <var>timeouts</var> be a new <a>timeouts configuration</a>.
+To <dfn>deserialize as timeouts configuration</dfn> given <var>timeouts</var>:
+<ol class=algorithm>
+ <li><p>Set <var>timeouts</var> to the result of <a>converting a
+ JSON-derived JavaScript value to an Infra value</a>
+ with <var>timeouts</var>.
 
-<li><p>
-If <var>value</var> is not a JSON <a>Object</a>,
-return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+ <li><p>Let <var>configuration</var> be a new <a>timeouts
+ configuration</a>.
 
-<li><p>
-If <var>value</var> has a property with the key "<code>script</code>":
+ <li><p>For each <var>key</var> → <var>value</var> in <var>timeouts</var>:
 
- <ol>
- <li><p>
- Let <var>script duration</var> be the value of property "<code>script</code>".
+  <ol>
+   <li><p>If «"<code>script</code>", "<code>pageLoad</code>",
+   "<code>implicit</code>"» does not [=list/contain=] <var>key</var>,
+   then continue.
 
- <li><p>
- If <var>script duration</var> is a number and less than 0 or greater than
- <a>maximum safe integer</a>, or it is not <a><code>null</code></a>,
- return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+   <li><p>If <var>value</var> is neither null nor a number greater than
+   or equal to 0 and less than or equal to the <a>maximum safe
+   integer</a> return <a>error</a> with <a>error code</a> <a>invalid
+   argument</a>.
 
- <li><p>
- Set <var>timeouts</var>’s <a>script timeout</a> to <var>script duration</var>.
- </ol>
+   <li><p>Run the substeps matching <var>key</var>:
 
-<li><p>
-If <var>value</var> has a property with the key "<code>pageLoad</code>":
+    <dl class=switch>
 
- <ol>
- <li><p>
- Let <var>page load duration</var> be the value of property "<code>pageLoad</code>".
+     <dt>"<code>script</code>"
+     <dd><p>Set <var>configuration</var>&apos;s [=timeouts/script
+     timeout=] to <var>value</var>.
 
- <li><p>
- If <var>page load duration</var> is less than 0 or greater than
- <a>maximum safe integer</a>, return <a>error</a> with
- <a>error code</a> <a>invalid argument</a>.
+     <dt>"<code>pageLoad</code>"
+     <dd><p>Set <var>configuration</var>&apos;s [=timeouts/page load
+     timeout=] to <var>value</var>.
 
- <li><p>
- Set <var>timeouts</var>’s <a>page load timeout</a> to <var>page load duration</var>.
- </ol>
+     <dt>"<code>implicit</code>"
+     <dd><p>Set <var>configuration</var>&apos;s [=timeouts/implicit wait
+     timeout=] to <var>value</var>.
+    </dl>
+  </ol>
 
-<li><p>
-If <var>value</var> has a property with the key "<code>implicit</code>":
+ <li><p>Return <a>success</a> with data <var>configuration</var>.
+</ol>
 
- <ol>
- <li><p>
- Let <var>implicit duration</var> be the value of property "<code>implicit</code>".
+To <dfn>serialize the timeouts configuration</dfn>
+given <var>timeouts</var>:
+
+<ol class=algorithm>
+ <li><p>Let <var>serialized</var> be an empty <a data-cite=infra>map</a>.
 
- <li><p>
- If <var>implicit duration</var> is less than 0 or greater than
- <a>maximum safe integer</a>, return <a>error</a> with
- <a>error code</a> <a>invalid argument</a>.
+ <li><p>Set <var>serialized</var>["<code>script</code>"]
+ to <var>timeouts</var>&apos; [=timeouts/script timeout=].
 
- <li><p>
- Set <var>timeouts</var>’s <a>implicit wait timeout</a> to <var>implicit duration</var>.
- </ol>
+ <li><p>Set <var>serialized</var>["<code>pageLoad</code>"]
+ to <var>timeouts</var>&apos; [=timeouts/page load timeout=].
 
-<li><p>
-Return <a>success</a> with data <var>timeouts</var>.
+ <li><p>Set <var>serialized</var>["<code>implicit</code>"]
+ to <var>timeouts</var>&apos; [=timeouts/implicit wait timeout=].
+
+ <li><p>Return <a>convert an Infra value to a JSON-compatible
+ JavaScript value</a> with <var>serialized</var>.
 </ol>
 
 
@@ -2718,12 +2753,13 @@ <h3><dfn>Get Timeouts</dfn></h3>
  </tr>
 </table>
 
-<p>
-The <a>remote end step</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>Let <var>timeouts</var> be the <a>timeouts object</a> for
- <a>session</a>’s <a>timeouts configuration</a>
+ <li><p>Let <var>timeouts</var> be <a>serialize the timeouts
+ configuration</a> with <a>session</a>&apos;s <a>timeouts
+ configuration</a>
 
  <li><p>Return <a>success</a> with data <var>timeouts</var>.
 </ol>
@@ -2744,20 +2780,19 @@ <h3><dfn>Set Timeouts</dfn></h3>
  </tr>
 </table>
 
-<p>
-The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
-<li><p>
-Let <var>timeouts</var> be the result of <a>trying</a> to
-<a>JSON deserialize</a> as a <a>timeouts configuration</a>
-the request’s <var>parameters</var>.
+ <li><p>Let <var>timeouts</var> be the result of <a>trying</a> to
+ <a>deserialize as timeouts configuration</a>
+ with <var>parameters</var>.
 
-<li><p>
-Make the <a>session timeouts</a> the new <var>timeouts</var>.
+ <li><p>Set <var>session</var>&apos;s <a>timeouts configuration</a>
+ to <var>timeouts</var>.
+
+ <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 
-<li><p>
-Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
 
 </section> <!-- /Set Timeout -->
@@ -2768,20 +2803,21 @@ <h3><dfn>Set Timeouts</dfn></h3>
 <h2>Navigation</h2>
 
 <p>The <a>commands</a> in this section allow navigation of
- the <a>current top-level browsing context</a> to new URLs
- and introspection of the document currently loaded in this <a>browsing context</a>.
+ the <a>session</a>&apos;s <a>current top-level browsing context</a> to new
+ URLs and introspection of the document currently loaded in
+ this <a>browsing context</a>.
 
 <p>For <a>commands</a> that cause a new document to load,
  the point at which the command returns
- is determined by the session’s <a>page loading strategy</a>.
+ is determined by the session&apos;s <a>page loading strategy</a>.
  The <a>normal</a> state causes it
- to return after the <a><code>load</code></a> <a>event fires</a> on the new page,
+ to return after the <a><code>load</code></a> [=fire an event|event fires=] on the new page,
  <a>eager</a> causes it to return
- after the <a><code>DOMContentLoaded</code></a> <a>event fires</a>,
+ after the <a><code>DOMContentLoaded</code></a> [=fire an event|event fires=],
  and <a>none</a> causes it to return immediately.
 
 <p>Navigation actions are also affected by the value of
- the <a>session page load timeout</a>,
+ the [=timeouts/page load timeout=],
  which determines the maximum time that commands will block
  before returning with a <a>timeout</a> <a>error</a>.
 
@@ -2831,42 +2867,60 @@ <h2>Navigation</h2>
  <li><p>Return <a>success</a> with data <var>value</var>.
 </ol>
 
-<p>When asked to <dfn data-lt="waiting for the navigation to complete">wait for navigation to complete</dfn>,
- run the following steps:
+<p>To <dfn>wait for navigation to complete</dfn>,
+ given <var>session</var> and optional <var>timer</var> (default
+ null):
 
 <ol>
- <li><p>If the <a>current session</a>
-  has a <a>page loading strategy</a> of <a>none</a>,
-  return <a>success</a> with data <a><code>null</code></a>.
+ <li><p>If <var>session</var>&apos;s <a>page loading strategy</a>
+  is <a>none</a>, return <a>success</a> with
+  data <a><code>null</code></a>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>success</a> with data <a><code>null</code></a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>success</a> with
+  data <a><code>null</code></a>.
+
+ <li><p>Let <var>timeout</var> be <a>session
+ timeouts</a>&apos; [=timeouts/page load timeout=].
+
+ <li><p>If <var>timer</var> is null:
+
+  <ol>
+   <li><p>Set <var>timer</var> to a new <a>timer</a>.
+
+   <li><p>If <var>timeout</var> is not null:
+
+   <ol>
+
+    <li><p><a>Start the timer</a> with <var>timer</var>
+    and <var>timeout</var>.
+
+   </ol>
+
+  </ol>
 
- <li><p>Start a <var>timer</var>. If this algorithm has not
-  completed before <var>timer</var> reaches
-  the <a>session</a>’s <a>session page load timeout</a> in
-  milliseconds, return an <a>error</a> with <a>error
-  code</a> <a>timeout</a>.
+ <li><p>Run these steps, but [=abort when=] <var>timer</var>&apos;s
+   [=timer/timeout fired flag=] is set:
 
- <li><p>If there is an ongoing attempt to <a>navigate</a>
-  the <a>current browsing context</a> that has not
+ <ol>
+
+  <li><p>If there is an ongoing attempt to <a>navigate</a>
+  <var>session</var>&apos;s <a>current browsing context</a> that has not
   yet <a>matured</a>, wait for navigation to <a>mature</a>.
 
- <li><p>Let <var>readiness target</var> be the <a>document
-  readiness</a> state associated with the <a>current
-  session</a>’s <a>page loading strategy</a>, which can be found in
-  the <a>table of page load strategies</a>.
+  <li><p>Let <var>readiness target</var> be the <a>document
+  readiness</a> state associated with the <var>session</var>&apos;s <a>page
+  loading strategy</a>, which can be found in the <a>table of page
+  load strategies</a>.
 
- <li><p>Wait for the <a>current browsing context</a>’s
-  <a>document readiness</a> state to reach
-  <var>readiness target</var>, or for the
-  <a>session page load timeout</a> to pass, whichever
-  occurs sooner.
+  <li><p>Wait for <var>session</var>&apos;s <a>current browsing
+  context</a>&apos;s <a>document readiness</a> state to reach
+  <var>readiness target</var>.
 
- <li><p>If the previous step completed by the
-  <a>session page load timeout</a> being reached
-  and the browser does not have an active <a>user prompt</a>,
-  return <a>error</a> with <a>error code</a> <a>timeout</a>.
+ </ol>
+
+ <li><p>[=If aborted=] return an <a>error</a> with <a>error
+ code</a> <a>timeout</a>.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -2883,16 +2937,16 @@ <h2>Navigation</h2>
    failed DNS lookup.
 
  <dt><a>response</a> is <a>blocked by content security policy</a>
- <dd><p>If the <a>current session</a>’s <a>secure TLS</a> state is disabled,
-  take implementation specific steps to ensure
-  the navigation is not aborted
-  and that the untrusted- or invalid TLS certificate error
-  that would normally occur under these circumstances,
-  are suppressed.
+
+ <dd><p>If the <a>remote end</a>&apos;s <a>accept insecure TLS</a> state is
+  true, take implementation specific steps to ensure the navigation
+  is not aborted and that the untrusted or invalid TLS certificate
+  error that would normally occur under these circumstances, are
+  suppressed.
 
   <p>Otherwise return <a>error</a> with <a>error code</a> <a>insecure certificate</a>.
 
- <dt><a>response</a>’s <a>HTTP status</a> is 401
+ <dt><a>response</a>&apos;s <a>HTTP status</a> is 401
  <dt>Otherwise
  <dd><p>Irrespective of how a possible authentication challenge is handled,
   return <a>success</a> with data <a><code>null</code></a>.
@@ -2912,71 +2966,117 @@ <h3><dfn>Navigate To</dfn></h3>
  </tr>
 </table>
 
-<p class=note>The command causes the user agent
- to <a>navigate</a> the <a>current top-level browsing context</a> to a new location.
+<p class=note>The command causes the user agent to <a>navigate</a>
+ the <a>session</a>&apos;s <a>current top-level browsing context</a> to a
+ new location.
 
-<p>If the <a>session</a> is not in a <a>secure TLS</a> state,
- no certificate errors that would normally
- cause the user agent to abort and show a security warning
- are to hinder navigation to the requested address.
+<p>If the <a>remote end</a>&apos;s <a>accept insecure TLS</a> flag is true, no
+ certificate errors that would normally cause the user agent to abort
+ and show a security warning are to hinder navigation to the requested
+ address.
 
 <aside class=example>
- <p>To navigate the <a>current top-level browsing context</a>
-  of the <a>session</a> with ID <i>1</i> to <code>https://example.com</code>,
-  the <a>local end</a> would POST to <i>/session/1/url</i> with the body:
+ <p>To navigate the <a>current top-level browsing context</a> of
+  the <a>session</a> with ID <i>1</i>
+  to <code>https://example.com</code>, the <a>local end</a> would POST
+  to <i>/session/1/url</i> with the body:
 
  <pre>{"url": "https://example.com"}</pre>
 </aside>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>Let <var>URL</var> be the result of <a>getting a property</a>
+  named "<code>url</code>" from <var>parameters</var>.
 
- <li><p>Let <var>url</var> be the result of
-  <a>getting the property</a> <code>url</code>
-  from the <var>parameters</var> argument.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p>If <var>url</var> is not an <a>absolute URL</a>
+
+ <li><p>If <var>URL</var> is not an <a>absolute URL</a>
   or is not an <a>absolute URL with fragment</a> or not a
-  <a>local scheme</a>,
-  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+  <a>local scheme</a>, return <a>error</a> with <a>error
+  code</a> <a>invalid argument</a>.
+
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p>Let <var>timeout</var> be <a>session</a>&apos;s <a>session
+ timeouts</a> [=timeouts/page load timeout=].
 
- <li><p>Let <var>current URL</var> be the <a>current top-level browsing context</a>’s
- <a>active document</a>’s <a>document URL</a>.
+ <li><p>Let <var>current URL</var> be <var>session</var>&apos;s <a>current
+ top-level browsing context</a>&apos;s <a>active document</a>&apos;s [=Document/URL=].
 
- <li><p>If <var>current URL</var> and <var>url</var> do not have the same
-   <a>absolute URL</a>:
+ <li><p>If <var>current URL</var> and <var>URL</var> do not have the
+ same <a>absolute URL</a> and <var>timeout</var> is not null:
+
+  <ol>
+
+   <li><p>Set <var>timer</var> to a new <a>timer</a>.
+
+   <li><p><a>Start the timer</a> with <var>timer</var>
+   and <var>timeout</var>.
+
+ </ol>
+
+ <li><p>Run these steps, but [=abort when=] <var>timer</var>&apos;s
+   [=timer/timeout fired flag=] is set:
+
+  <ol>
+
+   <li><p><a>Navigate</a> <var>session</var>&apos;s <a>current top-level
+   browsing context</a> to <var>URL</var>.
+
+   <li><p>If <var>URL</var> <a>is special</a> except for <code>file</code> and
+   <var>current URL</var> and <var>URL</var> do not have the same <a>absolute URL</a> :
+
+    <ol>
+     <li><p><a>Try</a> to <a>wait for navigation to complete</a>
+     with <var>session</var> and <var>timer</var>.
+
+     <li><p><a>Try</a> to run the <a>post-navigation checks</a>.
+    </ol>
+
+   <li><p><a>Set the current browsing context</a>
+   with <var>session</var> and <a>current top-level browsing
+   context</a>.
+
+   <!-- This redirect handling is extremely badly specified -->
+
+   <li><p>While <var>session</var>&apos;s <a>current top-level browsing context</a> contains
+   a <a>refresh state pragma directive</a> of <var>time</var> 1 second
+   or less, run the following steps:
 
    <ol>
-     <li>If <var>timer</var> has not been started, start
-       a <var>timer</var>. If this algorithm has not completed
-       before <var>timer</var> reaches the <a>session</a>’s <a>session page
-       load timeout</a> in milliseconds, return an <a>error</a>
-       with <a>error code</a> <a>timeout</a>.
-   </ol>
+    <li><p>Set <var>current URL</var> to <var>session</var>&apos;s
+    <a>current top-level browsing context</a>&apos;s <a>active
+    document</a>&apos;s [=Document/URL=].
 
- <li><p><a>Navigate</a> the <a>current top-level browsing context</a> to <var>url</var>.
+   <li><p>Wait until the refresh timeout has elapsed and
+   new <a>navigate</a> of <var>session</var>&apos;s <a>current top-level
+   browsing context</a> has begun.
 
- <li><p>If <var>url</var> <a>is special</a> except for <code>file</code> and
+   <li><p>Set <var>URL</var> to the destination URL of <var>session</var>&apos;s
+   <a>current top-level browsing context</a>&apos;s <a>active
+   document</a>&apos;s ongoing navigation.
+
+   <li><p>If <var>URL</var> <a>is special</a> except for <code>file</code> and
    <var>current URL</var> and <var>URL</var> do not have the same <a>absolute URL</a> :
- <ol>
-  <li><p><a>Try</a> to <a>wait for navigation to complete</a>.
 
-  <li><p><a>Try</a> to run the <a>post-navigation checks</a>.
- </ol>
+    <ol>
+     <li><p><a>Try</a> to <a>wait for navigation to complete</a>
+     with <var>session</var> and <var>timer</var>.
 
- <li><p><a>Set the current browsing context</a> with the <a>current
-  top-level browsing context</a>.
+     <li><p><a>Try</a> to run the <a>post-navigation checks</a>.
+    </ol>
+   </ol>
+  </ol>
 
- <li><p>If the <a>current top-level browsing context</a> contains
-  a <a>refresh state pragma directive</a> of <var>time</var> 1 second
-  or less, wait until the refresh timeout has elapsed, a
-  new <a>navigate</a> has begun, and return to the first step of this
-  algorithm.
+ <li><p>[=If aborted=] return an <a>error</a> with <a>error
+ code</a> <a>timeout</a>.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -2996,19 +3096,22 @@ <h3><dfn>Get Current URL</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
- <li><p>Let <var>url</var> be the <a data-lt="URL serializer">serialization</a>
-  of the <a>current top-level browsing context</a>’s
-  <a>active document</a>’s <a>document URL</a>.
+ <li><p>Let <var>URL</var> be the <a data-lt="URL serializer">serialization</a>
+  of <var>session</var>&apos;s <a>current top-level browsing context</a>&apos;s
+  <a>active document</a>&apos;s [=Document/URL=].
 
- <li><p>Return <a>success</a> with data <var>url</var>.
+ <li><p>Return <a>success</a> with data <var>URL</var>.
 </ol>
 </section>
 
@@ -3028,30 +3131,48 @@ <h3><dfn>Back</dfn></h3>
 
 <p class=note>This command causes the browser to traverse
  one step backward in the <a>joint session history</a>
- of the <a>current top-level browsing context</a>.
+ of <var>session</var>&apos;s <a>current top-level browsing context</a>.
  This is equivalent to pressing the back button in the <a>browser chrome</a>
  or invoking <code>window.history.back</code>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
+
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
+
+ <li><p>Let <var>timeout</var> be <var>session</var>&apos; <a>session
+ timeouts</a> [=timeouts/page load timeout=].
+
+ <li><p>Let <var>timer</var> be a new <a>timer</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p>If <var>timeout</var> is not null:
+
+  <ol>
+   <li><p><a>Start the timer</a> with <var>timer</var> and <var>timeout</var>.
+  </ol>
 
  <li><p><a>Traverse the history by a delta</a> –1
-  for the <a>current browsing context</a>.
+  for <var>session</var>&apos;s <a>current browsing context</a>.
 
- <li><p>If the previous step completed results in a <a><code>pageHide</code></a>
-  <a>event firing</a>, wait until <a><code>pageShow</code></a> <a>event fires</a>
-  or for the <a>session page load timeout</a> milliseconds to pass,
-  whichever occurs sooner.
+ <li><p>If the previous step completed results in
+  a <a><code>pageHide</code></a> [=fire an event|event firing=], wait
+  until <a><code>pageShow</code></a> [=fire an event|event fires=]
+  or <var>timer</var>&apos; [=timer/timeout fired flag=] to be set,
+  whichever occurs first.
 
- <li><p>If the previous step completed by the <a>session page load
-   timeout</a> being reached, and <a data-lt="handle any user
-   prompts">user prompts have been handled</a>, return <a>error</a>
-   with <a>error code</a> <a>timeout</a>.
+ <li><p>If <var>timer</var>&apos; [=timer/timeout fired flag=] is set:
+
+  <ol>
+   <li><p><a>Handle any user prompts</a>.
+
+   <li><p>Return <a>error</a> with <a>error code</a> <a>timeout</a>.
+  </ol>
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -3073,30 +3194,47 @@ <h3><dfn>Forward</dfn></h3>
 
 <p class=note>This command causes the browser
  to traverse one step forwards in the <a>joint session history</a>
- of the <a>current top-level browsing context</a>.
+ of <var>session</var>&apos;s <a>current top-level browsing context</a>.
  This is equivalent to pressing the forward button in the <a>browser chrome</a>
  or invoking <code>window.history.forward</code>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
+
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p>Let <var>timeout</var> be <var>session</var>&apos; <a>session
+ timeouts</a> [=timeouts/page load timeout=].
+
+ <li><p>Let <var>timer</var> be a new <a>timer</a>.
+
+ <li><p>If <var>timeout</var> is not null:
+
+  <ol>
+   <li><p><a>Start the timer</a> with <var>timer</var> and <var>timeout</var>.
+  </ol>
 
  <li><p><a>Traverse the history by a delta</a> 1
-  for the <a>current browsing context</a>.
+  for <var>session</var>&apos;s <a>current browsing context</a>.
 
  <li><p>If the previous step completed results in a <a><code>pageHide</code></a>
-   <a>event</a> firing, wait until <a><code>pageShow</code></a> <a>event fires</a>
-   or for the <a>session page load timeout</a> milliseconds to pass,
-   whichever occurs sooner.
+ <a>event</a> firing, wait until <a><code>pageShow</code></a> [=fire
+ an event|event fires=] or <var>timer</var>&apos; [=timer/timeout
+ fired flag=] to be set, whichever occurs first.
+
+ <li><p>If <var>timer</var>&apos; [=timer/timeout fired flag=] is set:
 
- <li><p>If the previous step completed by the <a>session page load
-   timeout</a> being reached, and <a data-lt="handle any user
-   prompts">user prompts have been handled</a>, return <a>error</a>
-   with <a>error code</a> <a>timeout</a>.
+  <ol>
+   <li><p><a>Handle any user prompts</a>.
+
+   <li><p>Return <a>error</a> with <a>error code</a> <a>timeout</a>.
+  </ol>
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -3116,29 +3254,35 @@ <h3><dfn>Refresh</dfn></h3>
  </tr>
 </table>
 
-<p class=note>This command causes the browser
- to reload the page in the <a>current top-level browsing context</a>.
+<p class=note>This command causes the browser to reload the page
+ in <var>session</var>&apos;s <a>current top-level browsing context</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
- <li><p>Initiate <a>an overridden reload</a> of the <a>current top-level browsing
-   context</a>’s <a>active document</a>.
+ <li><p>Initiate <a>an overridden reload</a>
+   of <var>session</var>&apos;s <a>current top-level browsing
+   context</a>&apos;s <a>active document</a>.
  </li>
 
- <li><p>If <var>url</var> <a>is special</a> except for <code>file</code>:
+ <li><p>If <var>URL</var> <a>is special</a> except for <code>file</code>:
   <ol>
-   <li><p><a>Try</a> to <a>wait for navigation to complete</a>.
+   <li><p><a>Try</a> to <a>wait for navigation to complete</a>
+   with <var>session</var>.
 
    <li><p><a>Try</a> to run the <a>post-navigation checks</a>.
   </ol>
 
- <li><p><a>Set the current browsing context</a> with <a>current
+ <li><p><a>Set the current browsing context</a>
+  with <var>session</var> and <var>session</var>&apos;s<a>current
   top-level browsing context</a>.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
@@ -3159,21 +3303,24 @@ <h3><dfn>Get Title</dfn></h3>
  </tr>
 </table>
 
-<p class=note>This command returns the <a>document title</a>
- of the <a>current top-level browsing context</a>,
+<p class=note>This command returns the document title
+ of <var>session</var>&apos;s <a>current top-level browsing context</a>,
  equivalent to calling <code>document.title</code>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
- <li><p>Let <var>title</var> be the result of calling the algorithm
-  for getting the <a><code>title</code></a> attribute of the <a>current
-  top-level browsing context</a>’s <a>active document</a>.
+ <li><p>Let <var>title</var> be
+ the <var>session</var>&apos;s <a>current top-level browsing
+ context</a>&apos;s <a>active document</a>&apos;s {{Document/title}}.
 
  <li><p>Return <a>success</a> with data <var>title</var>.
 </ol>
@@ -3184,73 +3331,145 @@ <h3><dfn>Get Title</dfn></h3>
 <h2>Contexts</h2>
 
 <p>Many WebDriver <a>commands</a> happen in the context of either
- the <a>current browsing context</a> or <a>current top-level browsing context</a>.
- The <a>current top-level browsing context</a> is represented in the protocol
- by its associated <a>window handle</a>.
- When a <a>top-level browsing context</a> is selected
- using the <a>Switch To Window</a> command,
- a specific <a>browsing context</a> can be selected
- using the <a>Switch to Frame</a> command.
+ <var>session</var>&apos;s <a>current browsing context</a> or <a>current
+ top-level browsing context</a>.
+ <var>session</var>&apos;s <a>current top-level browsing context</a> is
+ represented in the protocol by its associated <a>window handle</a>.
+ When a <a>top-level browsing context</a> is selected using
+ the <a>Switch To Window</a> command, a specific <a>browsing
+ context</a> can be selected using the <a>Switch to Frame</a> command.
 
 <p class=note>The use of the term “window” to
  refer to a <a>top-level browsing context</a>
- is legacy and doesn’t correspond with either
+ is legacy and doesn&apos;t correspond with either
  the operating system notion of a “window”
  or the DOM <a><code>Window</code></a> object.
 
+<!-- this could use a link for destroyed, but there isn&apos;t one that works
+for both top-level and nested traversables. Generally all the infrastructure
+here needs to be rewritten. -->
 <p>A <a>browsing context</a> is said to be <dfn>no longer open</dfn>
- if it has been <a>discarded</a>.
+ if its <a>navigable</a> has been destroyed.
 
 <p>Each <a>browsing context</a> has an associated
  <dfn data-lt="window handles">window handle</dfn> which uniquely
  identifies it. This must be a <a>String</a> and must not be
  "<code>current</code>".
 
-<p>The <dfn>web window identifier</dfn>
- is the string constant "<code>window-fcc6-11e5-b4f8-330a88ab9d7f</code>".
+<p>A <dfn data-lt="web frames">web frame</dfn>
+  is an abstraction used to identify a <a>frame</a> or <a>iframe</a>
+  when it is transported via the <a href="#protocol">protocol</a>,
+  between <a>remote</a> and <a>local</a> ends.
 
 <p>The <dfn>web frame identifier</dfn>
  is the string constant "<code>frame-075b-4da1-b6ba-e579c2d3230a</code>".
 
+<p>An ECMAScript <a>Object</a> <dfn>represents a web frame</dfn>
+  if it has a <a>web frame identifier</a> <a>own property</a>.
+
+<p>A <dfn data-lt="web windows">web window</dfn>
+  is an abstraction used to identify a <a>window</a>
+  when it is transported via the <a href="#protocol">protocol</a>,
+  between <a>remote</a> and <a>local</a> ends.
+
+<p>The <dfn>web window identifier</dfn>
+  is the string constant "<code>window-fcc6-11e5-b4f8-330a88ab9d7f</code>".
+
+<p>An ECMAScript <a>Object</a> <dfn>represents a web window</dfn>
+  if it has a <a>web window identifier</a> <a>own property</a>.
+
 <p>The <dfn><code>WindowProxy</code> reference object</dfn>
  with <a><code>WindowProxy</code></a> object <var>window</var> is
  given by:
 
-<ol>
- <li><p>Let <var>identifier</var> be the <a>web window identifier</a>
-  if the associated <a>browsing context</a> of <var>window</var>
-  is a <a>top-level browsing context</a>.
+<ol>
+ <li><p>Let <var>identifier</var> be the <a>web window identifier</a>
+  if the associated <a>browsing context</a> of <var>window</var>
+  is a <a>top-level browsing context</a>.
+
+  <p>Otherwise let it be the <a>web frame identifier</a>.
+
+ <li><p>Return a JSON <a>Object</a> initialized with the following properties:
+
+  <dl>
+   <dt><var>identifier</var>
+   <dd><p>Associated <a>window handle</a> of the <var>window</var>&apos;s <a>browsing context</a>.
+  </dl>
+</ol>
+
+<p>To <dfn>deserialize a web frame</dfn> by a
+  JSON <a>Object</a> <var>object</var> that
+  <a>represents a web frame</a>:
+
+<ol>
+  <li><p>If <var>object</var> has no <a>own property</a> <a>web frame identifier</a>,
+    return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+
+  <li><p>Let <var>reference</var> be the result of
+    <a data-lt="getting a property">getting</a>
+    the <a>web frame identifier</a> property
+    from <var>object</var>.
+
+  <li><p>Let <var>browsing context</var> be the <a>browsing context</a> whose
+    <a>window handle</a> is <var>reference</var>, or null if no such
+    <a>browsing context</a> exists.
+
+  <li><p>If <var>browsing context</var> is null or a <a>top-level browsing context</a>,
+    return <a>error</a> with <a>error code</a> <a>no such frame</a>.
+
+  <li><p>Return <a>success</a> with data <var>browsing context</var>&apos;s associated window.
+</ol>
+
+<p>To <dfn>deserialize a web window</dfn> by a
+  JSON <a>Object</a> <var>object</var> that <a>represents a web
+    window</a>:
+
+<ol>
+  <li><p>If <var>object</var> has no <a>own property</a> <a>web window identifier</a>,
+    return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+
+  <li><p>Let <var>reference</var> be the result of
+    <a data-lt="getting a property">getting</a>
+    the <a>web window identifier</a> property
+    from <var>object</var>.
 
-  <p>Otherwise let it be the <a>web frame identifier</a>.
+  <li>
+    <p>Let <var>browsing context</var> be the <a>browsing context</a> whose
+      <a>window handle</a> is <var>reference</var>, or null if no such
+      <a>browsing context</a> exists.
 
- <li><p>Return a JSON <a>Object</a> initialized with the following properties:
+  <li><p>If <var>browsing context</var> is null or not a <a>top-level browsing context</a>,
+    return <a>error</a> with <a>error code</a> <a>no such window</a>.
 
-  <dl>
-   <dt><var>identifier</var>
-   <dd><p>Associated <a>window handle</a> of the <var>window</var>’s <a>browsing context</a>.
-  </dl>
+  <li><p>Return <a>success</a> with data <var>browsing context</var>&apos;s associated window.
 </ol>
 
 <p>When required to <dfn>set the current browsing context</dfn> given
-   a <var>context</var>, an implementation must follow the following
-   steps:
+   <var>session</var> and <var>context</var>, an implementation must
+   follow the following steps:
+
 <ol>
-  <li>Set the <a>current session</a>’s <a>current browsing
-      context</a> to <var>context</var>.
-  <li>Set the <a>current session</a>’s <a>current parent browsing
+  <li><p>Set <var>session</var>&apos;s <a>current browsing
+   context</a> to <var>context</var>.
+
+  <li><p>Set the <var>session</var>&apos;s <a>current parent browsing
     context</a> to the <a>parent browsing context</a>
     of <var>context</var>, if that context exists, or <a>null</a>
     otherwise.
 </ol>
 
 <p>When required to <dfn>set the current top-level browsing
-   context</dfn> given a <var>context</var>, an implementation must
-   follow the following steps:
+   context</dfn> given <var>session</var> and <var>context</var>, an
+   implementation must:
+
 <ol>
-  <li>Assert: <var>context</var> is a <a>top-level browsing context</a>.
-  <li>Set the <a>current session</a>’s <a>current top-level browsing
+  <li><p>Assert: <var>context</var> is a <a>top-level browsing context</a>.
+
+  <li><p>Set <var>session</var>&apos;s <a>current top-level browsing
       context</a> to <var>context</var>.
-  <li><a>Set the current browsing context</a> to <var>context</var>.
+
+  <li><p><a>Set the current browsing context</a> with <var>session</var>
+   and <var>context</var>.
 </ol>
 
 <p class=note>
@@ -3273,14 +3492,16 @@ <h3><dfn>Get Window Handle</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
  <li><p>Return <a>success</a> with data being the <a>window handle</a>
-  associated with the <a>current top-level browsing context</a>.
+  associated with <var>session</var>&apos;s <a>current top-level browsing context</a>.
 </ol>
 </section> <!-- /Get Window Handle -->
 
@@ -3298,21 +3519,27 @@ <h3><dfn>Close Window</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
- <li><p><a>Close</a> the <a>current top-level browsing context</a>.
+ <li><p><a>Close</a> <var>session</var>&apos;s <a>current top-level
+ browsing context</a>.
 
  <li><p>If there are no more open <a>top-level browsing contexts</a>,
   then <a>try</a> to <a>close the session</a>.
 
- <li>Return the result of running the <a>remote end steps</a>
-  for the <a>Get Window Handles</a> <a>command</a>.
+ <li>Return the result of running the <a>remote end steps</a> for
+  the <a>Get Window Handles</a> <a>command</a>,
+  with <var>session</var>, <var>URL variables</var>
+  and <var>parameters</var>.
 </ol>
 </section> <!-- /Close Window -->
 
@@ -3331,17 +3558,18 @@ <h3><dfn>Switch To Window</dfn></h3>
 </table>
 
 <p class=note>
-Switching window will select the <a>current top-level browsing context</a>
-used as the target for all subsequent <a>commands</a>.
-In a tabbed browser, this will typically
+Switching window will select <var>session</var>&apos;s <a>current top-level
+browsing context</a> used as the target for all
+subsequent <a>commands</a>.  In a tabbed browser, this will typically
 make the tab containing the <a>browsing context</a> the selected tab.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>Let <var>handle</var> be the result of
   <a>getting the property</a> "<code>handle</code>"
-  from the <var>parameters</var> argument.
+  from <var>parameters</var>.
 
  <li><p>If <var>handle</var> is <a>undefined</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
@@ -3351,15 +3579,15 @@ <h3><dfn>Switch To Window</dfn></h3>
   return <a>error</a> with <a>error code</a> <a>unexpected alert open</a>.
 
  <li><p>If <var>handle</var> is equal to the associated <a>window
-  handle</a> for some <a>top-level browsing context</a> in
-  the <a>current session</a>, let <var>context</var> be the that
-  browsing context, and
-  <a>set the current top-level browsing context</a> with <var>context</var>.
+  handle</a> for some <a>top-level browsing context</a>,
+  let <var>context</var> be the that browsing context, and
+  <a>set the current top-level browsing context</a>
+  with <var>session</var> and <var>context</var>.
 
   <p>Otherwise, return <a>error</a> with <a>error code</a> <a>no such window</a>.
 
  <li><p>Update any implementation-specific state that would result
-  from the user selecting the <a>current browsing context</a> for
+  from the user selecting <var>session</var>&apos;s <a>current browsing context</a> for
   interaction, without altering OS-level focus.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
@@ -3382,10 +3610,11 @@ <h3><dfn>Get Window Handles</dfn></h3>
 
 <p>The order in which the window handles are returned is arbitrary.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>Let <var>handles</var> be a JSON <a>List</a>.
+ <li><p>Let <var>handles</var> be a <a>List</a>.
 
  <li><p>For each <a>top-level browsing context</a> in the <a>remote end</a>,
   push the associated <a>window handle</a> onto <var>handles</var>.
@@ -3417,23 +3646,26 @@ <h3><dfn>New Window</dfn></h3>
 
 <p>Create a new <a>top-level browsing context</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>If the implementation does not support creating new top-level
   browsing contexts, return <a>error</a> with <a>error code</a>
   <a>unsupported operation</a>.
 
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
  <li><p>Let <var>type hint</var> be the result of <a>getting the property</a>
-  "<code>type</code>" from the <var>parameters</var> argument.
+  "<code>type</code>" from <var>parameters</var>.
 
  <li><p>Create a new <a>top-level browsing context</a> by running
-  the <a>window open steps</a> with <var>url</var> set to
+  the <a>window open steps</a> with <var>URL</var> set to
   "<code>about:blank</code>", <var>target</var> set to the empty
   string, and <var>features</var> set to "<code>noopener</code>" and
   the user agent configured to create a new browsing context. This must
@@ -3441,7 +3673,7 @@ <h3><dfn>New Window</dfn></h3>
   context. If <var>type hint</var> has the value "<code>tab</code>",
   and the implementation supports multiple browsing context in the
   same OS window, the new browsing context should share an OS window
-  with the <a>current browsing context</a>. If <var>type hint</var> is
+  with <var>session</var>&apos;s <a>current browsing context</a>. If <var>type hint</var> is
   "<code>window</code>", and the implementation supports multiple
   browsing contexts in separate OS windows, the created browsing
   context should be in a new OS window. In all other cases the details
@@ -3452,7 +3684,7 @@ <h3><dfn>New Window</dfn></h3>
   associated <a>window handle</a> of the newly created window.
 
  <li><p>Let <var>type</var> be "<code>tab</code>" if the newly created
-  window shares an OS-level window with the <a>current browsing
+  window shares an OS-level window with <var>session</var>&apos;s <a>current browsing
   context</a>, or "<code>window</code>" otherwise.
 
  <li><p>Let <var>result</var> be a new JSON <a>Object</a> initialized with:
@@ -3486,16 +3718,18 @@ <h3><dfn>Switch To Frame</dfn></h3>
 </table>
 
 <p class=note>The <a>Switch To Frame</a> command is used to select
- the <a>current top-level browsing context</a> or a <a>child browsing context</a>
- of the <a>current browsing context</a> to use as the <a>current browsing context</a>
- for subsequent <a>commands</a>.
+ <var>session</var>&apos;s <a>current top-level browsing context</a> or
+ a <a>child browsing context</a> of <var>session</var>&apos;s <a>current
+ browsing context</a> to use as <var>session</var>&apos;s <a>current
+ browsing context</a> for subsequent <a>commands</a>.
 
-<p>The <a>remote end steps</a> are:
+The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>Let <var>id</var> be the result of
   <a>getting the property</a> "<code>id</code>"
-  from the <var>parameters</var> argument.
+  from <var>parameters</var>.
 
  <li><p>If <var>id</var> is not <a><code>null</code></a>,
   a <code>Number</code> object,
@@ -3508,15 +3742,16 @@ <h3><dfn>Switch To Frame</dfn></h3>
    <dt><var>id</var> is <a><code>null</code></a>
    <dd>
     <ol>
-      <li><p>If the <a>current top-level browsing context</a> is <a>no
-            longer open</a>, return <a>error</a> with <a>error code</a> <a>no
-            such window</a>.
+      <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+            context</a> is <a>no longer open</a>, return <a>error</a>
+            with <a>error code</a> <a>no such window</a>.
 
-      <li><p><a>Handle any user prompts</a>
-          and return its value if it is an <a>error</a>.
+          <li><p><a>Try</a> to <a>handle any user prompts</a>
+          with <var>session</var>.
 
      <li><p><a>Set the current browsing context</a> with
-         the <a>current top-level browsing context</a>.
+         <var>session</var> and <var>session</var>&apos;s <a>current
+         top-level browsing context</a>.
     </ol>
 
    <dt><var>id</var> is a <code>Number</code> object
@@ -3525,15 +3760,15 @@ <h3><dfn>Switch To Frame</dfn></h3>
      <li><p>If <var>id</var> is less than 0 or greater than 2<sup>16</sup> – 1,
       return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
-     <li><p>If the <a>current browsing context</a> is <a>no
+     <li><p>If <var>session</var>&apos;s <a>current browsing context</a> is <a>no
            longer open</a>, return <a>error</a> with <a>error code</a> <a>no
            such window</a>.
 
-     <li><p><a>Handle any user prompts</a>
-         and return its value if it is an <a>error</a>.
+     <li><p><a>Try</a> to <a>handle any user prompts</a>
+         with <var>session</var>.
 
      <li><p>Let <var>window</var> be the <a>associated window</a>
-      of the <a>current browsing context</a>’s <a>active document</a>.
+      of <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>active document</a>.
 
      <li><p>If <var>id</var> is not
       a <a>supported property index</a> of <var>window</var>,
@@ -3542,38 +3777,40 @@ <h3><dfn>Switch To Frame</dfn></h3>
      <li><p>Let <var>child window</var> be
       the <a><code>WindowProxy</code></a> object obtained by
       calling
-      <var>window</var>.<a data-lt='window.[[\getOwnProperty]]'><code>[[\GetOwnProperty]]</code></a>
+      <var>window</var>.<a data-lt="window.[[\getOwnProperty]]"><code>[[\GetOwnProperty]]</code></a>
       (<var>id</var>).
 
      <li><p><a>Set the current browsing context</a> with
-      <var>child window</var>’s <a>browsing context</a>.
+      <var>session</var> and <var>child window</var>&apos;s <a>browsing context</a>.
     </ol>
 
    <dt><var>id</var> <a>represents a web element</a>
    <dd>
     <ol>
-     <li><p>If the <a>current browsing context</a> is <a>no
+     <li><p>If <var>session</var>&apos;s <a>current browsing context</a> is <a>no
            longer open</a>, return <a>error</a> with <a>error code</a> <a>no
            such window</a>.
 
-     <li><p><a>Handle any user prompts</a>
-         and return its value if it is an <a>error</a>.
+      <li><p><a>Try</a> to <a>handle any user prompts</a>
+       with <var>session</var>.
 
      <li><p>Let <var>element</var> be the result
-      of <a>trying</a> to <a>get a known connected element</a>
-      by <a>web element reference</a> <var>id</var>.
+      of <a>trying</a> to <a>get a known element</a>
+      with <var>session</var> and <var>id</var>.
 
-     <li><p>If <var>element</var> is not a <a><code>frame</code></a>
-      or <a><code>iframe</code></a> element,
+     <li><p>If <var>element</var> is not a [^frame^]
+      or [^iframe^] element,
       return <a>error</a> with <a>error code</a> <a>no such frame</a>.
 
      <li><p><a>Set the current browsing context</a>
-     with <var>element</var>’s <a>nested browsing context</a>.
+     with <var>session</var> and <var>element</var>&apos;s [=navigable
+     container/content navigable=]&apos;s [=navigable/active browsing
+     context=].
     </ol>
  </dl>
 
  <li><p>Update any implementation-specific state that would result
-  from the user selecting the <a>current browsing context</a> for
+  from the user selecting <var>session</var>&apos;s <a>current browsing context</a> for
   interaction, without altering OS-level focus.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
@@ -3599,37 +3836,43 @@ <h3><dfn>Switch To Parent Frame</dfn></h3>
 </table>
 
 <p class=note>The <a>Switch to Parent Frame</a> <a>command</a>
- sets the <a>current browsing context</a> for future <a>commands</a>
- to the parent of the <a>current browsing context</a>.
+ sets <var>session</var>&apos;s <a>current browsing context</a> for future <a>commands</a>
+ to the parent of <var>session</var>&apos;s <a>current browsing context</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>Run the substeps if the <a>current browsing context</a> is already the
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a> is already the
   <a>top-level browsing context</a>:
 
-  <ol>
-    <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
-    <li><p>Return <a>success</a> with data <a><code>null</code></a>.
-  </ol>
+ <ol>
+
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+   is <a>no longer open</a>, return <a>error</a> with <a>error
+   code</a> <a>no such window</a>.
 
- <li><p>If the <a>current parent browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ </ol>
 
- <li><p>If the <a>current session</a>'s <a>current parent browsing
- context</a> is not <a>null</a>, <a>set the current browsing
- context</a> with the <a>current parent browsing context</a>.
+ <li><p>If <var>session</var>&apos;s <a>current parent browsing context</a>
+   is <a>no longer open</a>, return <a>error</a> with <a>error
+   code</a> <a>no such window</a>.
 
- <li><p>Update any implementation-specific state that would result
-  from the user selecting the <a>current browsing context</a> for
+  <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
+
+  <li><p>If <a>session</a>&apos;s <a>current parent browsing context</a> is
+  not <a>null</a>, <a>set the current browsing context</a>
+  with <var>session</var> and <a>current parent browsing context</a>.
+
+  <li><p>Update any implementation-specific state that would result
+  from the user selecting <var>session</var>&apos;s <a>current browsing context</a> for
   interaction, without altering OS-level focus.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
+
 </ol>
 </section> <!-- /Switch To Parent Frame -->
 
@@ -3638,8 +3881,8 @@ <h3>Resizing and positioning windows</h3>
 
 <p>WebDriver provides <a>commands</a>
  for interacting with the operating system window
- containing the <a>current top-level browsing context</a>.
- Because different operating systems’ window managers provide different abilities,
+ containing <var>session</var>&apos;s <a>current top-level browsing context</a>.
+ Because different operating systems&apos; window managers provide different abilities,
  not all of the commands in this section can be supported by all <a>remote ends</a>.
  Support for these <a>commands</a> is determined by the <a>window
  dimensioning/positioning</a> <a>capability</a>.
@@ -3688,16 +3931,10 @@ <h3>Resizing and positioning windows</h3>
  </tr>
 </table>
 
-<p>If for whatever reason
- the <a>top-level browsing context</a>’s OS window
- cannot enter either of the <a>window states</a>,
- or if this concept is not applicable on the current system,
- the default state must be <a data-lt="normal window state">normal</a>.
-
-<p>A <a>top-level browsing context</a>’s <dfn>window rect</dfn>
- is defined as a dictionary of the <a>screenX</a>, <a>screenY</a>,
- <a>outerWidth</a> and <a>outerHeight</a> attributes
- of the <a><code>WindowProxy</code></a>.
+<p>If for whatever reason the <a>top-level browsing context</a>&apos;s
+OS window cannot enter either of the <a>window states</a>, or if this
+concept is not applicable on the current system, the default state
+must be <a data-lt="normal window state">normal</a>.
 
 <p>The <dfn>WindowRect object</dfn> for
 a <a>WindowProxy</a>, <var>window</var> is an <a>Object</a> initialized
@@ -3705,16 +3942,16 @@ <h3>Resizing and positioning windows</h3>
 
 <dl>
  <dt>"<code>x</code>"
- <dd><p><var>window</var>’s <a>screenX</a> attribute.
+ <dd><p><var>window</var>&apos;s <a>screenX</a> attribute.
 
  <dt>"<code>y</code>"
- <dd><p><var>window</var>’s <a>screenY</a> attribute.
+ <dd><p><var>window</var>&apos;s <a>screenY</a> attribute.
 
  <dt>"<code>width</code>"
- <dd><p><var>windows</var>’s <a>outerWidth</a> attribute.
+ <dd><p><var>windows</var>&apos;s <a>outerWidth</a> attribute.
 
  <dt>"<code>height</code>"
- <dd><p><var>window</var>’s <a>outerHeight</a> attribute.
+ <dd><p><var>window</var>&apos;s <a>outerHeight</a> attribute.
 </dl>
 
 <p>To <dfn>maximize the window</dfn>,
@@ -3736,11 +3973,11 @@ <h3>Resizing and positioning windows</h3>
  given an operating system level window
  with an associated <a>top-level browsing context</a>,
  run implementation-specific steps
- to iconify, minimize, or hide the window
- from the visible screen.
+ to transition the operating system level window
+ into the <a>minimized window state</a>.
  Do not return from this operation
  until the <a>visibility state</a>
- of the <a>top-level browsing context</a>’s <a>active document</a>
+ of the <a>top-level browsing context</a>&apos;s <a>active document</a>
  has reached the <a data-lt="visibility hidden">hidden</a> state,
  or until the operation times out.
 
@@ -3752,7 +3989,7 @@ <h3>Resizing and positioning windows</h3>
  to the visible screen.
  Do not return from this operation
  until the <a>visibility state</a>
- of the <a>top-level browsing context</a>’s <a>active document</a>
+ of the <a>top-level browsing context</a>&apos;s <a>active document</a>
  has reached the <a data-lt="visibility visible">visible</a> state,
  or until the operation times out.
 
@@ -3773,18 +4010,22 @@ <h4><dfn>Get Window Rect</dfn></h4>
 <p class=note>The <a>Get Window Rect</a> <a>command</a>
  returns the size and position on the screen
  of the operating system window corresponding
- to the <a>current top-level browsing context</a>.
+ to <var>session</var>&apos;s <a>current top-level browsing context</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing context</a> is <a>no longer open</a>,
    return <a>error</a> with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Return <a>success</a> with data set to the <a>WindowRect
-  object</a> for the <a>current top-level browsing context</a>.
+  object</a> for the <var>session</var>&apos;s <a>current top-level browsing
+  context</a>.
+
 </ol>
 </section> <!-- /Get Window Rect -->
 
@@ -3805,64 +4046,85 @@ <h4><dfn>Set Window Rect</dfn></h4>
 <p class=note>
 The <a>Set Window Rect</a> <a>command</a>
 alters the size and the position of the operating system window
-corresponding to the <a>current top-level browsing context</a>.
+corresponding to <var>session</var>&apos;s <a>current top-level browsing context</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>Let <var>width</var> be the result of
-  <a>getting a property</a> named <code>width</code>
-  from the <var>parameters</var> argument, else let it be <a><code>null</code></a>.
+  <a>getting a property</a> named "<code>width</code>"
+  from <var>parameters</var></a>.
+
+ <li><p>If <var>width</var> is <a>undefined</a>, let <var>width</var>
+  be null.
 
  <li><p>Let <var>height</var> be the result of
-  <a>getting a property</a> named <code>height</code>
-  from the <var>parameters</var> argument, else let it be <a><code>null</code></a>.
+  <a>getting a property</a> named "<code>height</code>"
+  from <var>parameters</var>.
+
+ <li><p>If <var>height</var> is <a>undefined</a>, let <var>height</var>
+  be null.
 
  <li><p>Let <var>x</var> be the result of <a>getting a property</a>
-  named <code>x</code> from the <var>parameters</var> argument,
-  else let it be <a><code>null</code></a>.
+  named "<code>x</code>" from <var>parameters</var>.
+
+ <li><p>If <var>x</var> is <a>undefined</a>, let <var>x</var> be null.
 
  <li><p>Let <var>y</var> be the result of <a>getting a property</a>
-  named <code>y</code> from the <var>parameters</var> argument,
-  else let it be <a><code>null</code></a>.
+  named "<code>y</code>" from <var>parameters</var>.
 
- <li><p>If <var>width</var> or <var>height</var> is neither <a><code>null</code></a>
-  nor a <a>Number</a> from 0 to 2<sup>31</sup> − 1,
-  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+ <li><p>If <var>y</var> is <a>undefined</a>, let <var>y</var> be null.
+
+ <li><p>If <var>width</var> or <var>height</var> is neither null, nor
+  a <a>Number</a> from 0 to 2<sup>31</sup> − 1, return <a>error</a>
+  with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If <var>x</var> or <var>y</var> is neither <a><code>null</code></a>
-  nor a <a>Number</a> from −(2<sup>31</sup>) to 2<sup>31</sup> − 1,
+ <li><p>If <var>x</var> or <var>y</var> is neither null, nor
+  a <a>Number</a> from −(2<sup>31</sup>) to 2<sup>31</sup> − 1,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>If the <a>remote end</a> does not support
   the <a>Set Window Rect</a> <a>command</a> for
-  the <a>current top-level browsing context</a> for any reason,
-  return <a>error</a> with <a>error code</a> <a>unsupported operation</a>.
+  <var>session</var>&apos;s <a>current top-level browsing context</a>
+  for any reason, return <a>error</a> with <a>error
+  code</a> <a>unsupported operation</a>.
+
+  <p class="note">In case the <a>Set Window Rect</a> command is
+  partially supported (i.e. some combinations of arguments are
+  supported but not others), the implmentation is expected to continue
+  with the remaining steps.
 
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p><a>Fully exit fullscreen</a>.
 
  <li><p><a>Restore the window</a>.
 
- <li><p>If <var>width</var> and <var>height</var> are not <a><code>null</code></a>:
+ <li><p>Let <var>window</var> be the operating system window containing
+     <var>session</var>&apos;s <a>current top-level browsing context</a>
+
+ <li><p>If the implementation is able to set the dimensions
+ of <var>window</var>:
 
   <ol>
-   <li><p>Set the width, in <a>CSS pixels</a>,
-    of the operating system window containing
-    the <a>current top-level browsing context</a>,
-    including any <a>browser chrome</a> and externally drawn window decorations
+   <li><p>If <var>width</var> is not null, set the width,
+    in <a>CSS pixels</a>, of <var>window</var>, including
+    any <a>browser chrome</a> and externally drawn window decorations,
     to a value that is as close as possible to <var>width</var>.
 
-  <li><p>Set the height, in <a>CSS pixels</a>,
-   of the operating system window containing
-   the <a>current top-level browsing context</a>,
-   including any <a>browser chrome</a> and externally drawn window decorations
+  <li><p>If <var>height</var> is not null, set the height,
+   in <a>CSS pixels</a>, of <var>window</var>, including
+   any <a>browser chrome</a> and externally drawn window decorations,
    to a value that is as close as possible to <var>height</var>.
 
+  </ol>
+
    <aside class=note>
     <p>The specification does not guarantee
      that the resulting window size will exactly match that which was requested.
@@ -3873,43 +4135,49 @@ <h4><dfn>Set Window Rect</dfn></h4>
     <p>Particular implementations may have other limitations
      such as not being able to resize in single-pixel increments.
 
-    <p>This is intended to mutate the value of the <a>current
-     top-level browsing context</a>’s <a><code>WindowProxy</code></a>’s
+    <p>This is intended to mutate the value
+     of <var>session</var>&apos;s <a>current top-level browsing
+     context</a>&apos;s <a><code>WindowProxy</code></a>&apos;s
      <a>outerWidth</a> and <a>outerHeight</a>
      properties. Specifically, the value of <a>outerWidth</a> should
      be as close as possible to <var>width</var> and the value
      of <a>outerHeight</a> should be as close as possible
      to <var>height</var>.
    </aside>
-  </ol>
 
- <li><p>If <var>x</var> and <var>y</var> are not <a><code>null</code></a>:
+ <li><p>If the implementation is able to set the position of <var>window</var>:
 
   <ol>
-   <li><p>Run the implementation-specific steps
-    to set the position of the operating system level window
-    containing the <a>current top-level browsing context</a>
-    to the position given by the <var>x</var> and <var>y</var> coordinates.
-
-    <aside class=note>
-     <p>Note that this step is similar
-      to calling the <a>moveTo(x, y)</a> method
-      on the <a><code>WindowProxy</code></a> object
-      associated with the <a>current top-level browsing context</a>,
-      but without the <a href=https://developer.mozilla.org/en-US/docs/Web/API/Window/moveTo>security restrictions</a> that you
-
-     <ol type=a>
-      <li>cannot move a window or tab
-       that was not created by <code>window.open</code>.
-
-      <li>cannot move a window or tab
-       when it is in a window with more than one tab.
-     </ol>
-   </aside>
+   <li><p>If <var>x</var> is not null, set the x-coordinate of the
+    left edge of <var>window</var> to a value that is as close as
+    possible to <var>x</var>.
+
+   <li><p>If <var>y</var> is not null, set the y-coordinate of the top
+    edge of <var>window</var> to a value that is as close as possible
+    to <var>y</var>.
   </ol>
 
-  <li><p>Return <a>success</a> with data set to the <a>WindowRect
-  object</a> for the <a>current top-level browsing context</a>.
+  <aside class=note>
+    <p>The specification does not guarantee
+     that the resulting window position will match that which was requested.
+
+   <p>This step is similar to calling the <a>moveTo(x,
+    y)</a> method on the <a><code>WindowProxy</code></a> object
+    associated with <var>session</var>&apos;s <a>current top-level browsing
+    context</a>, but without the
+    <a href=https://developer.mozilla.org/en-US/docs/Web/API/Window/moveTo>security
+    restrictions</a> that you
+
+   <ol type=a>
+    <li>cannot move a window or tab that was not created by <code>window.open</code>.
+
+    <li>cannot move a window or tab when it is in a window with more than one tab.
+   </ol>
+  </aside>
+
+ <li><p>Return <a>success</a> with data set to the <a>WindowRect
+  object</a> for the <var>session</var>&apos;s <a>current top-level browsing
+  context</a>.
 </ol>
 </section> <!-- /Set Window Rect -->
 
@@ -3927,34 +4195,37 @@ <h4><dfn>Maximize Window</dfn></h4>
  </tr>
 </table>
 
-<p class=note>The <a>Maximize Window</a> command
- invokes the window manager-specific “maximize” operation, if any,
- on the window containing the <a>current top-level browsing context</a>.
- This typically increases the window to the maximum available size
- without going full-screen.
+<p class=note>The <a>Maximize Window</a> command invokes the window
+ manager-specific “maximize” operation, if any, on the window
+ containing <var>session</var>&apos;s <a>current top-level browsing
+ context</a>.  This typically increases the window to the maximum
+ available size without going full-screen.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>remote end</a> does not support
-  the <a>Maximize Window</a> command
-  for the <a>current top-level browsing context</a> for any reason,
-  return <a>error</a> with <a>error code</a> <a>unsupported operation</a>.
+ <li><p>If the <a>remote end</a> does not support the <a>Maximize
+  Window</a> command for <var>session</var>&apos;s <a>current top-level
+  browsing context</a> for any reason, return <a>error</a>
+  with <a>error code</a> <a>unsupported operation</a>.
 
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p><a>Fully exit fullscreen</a>.
 
  <li><p><a>Restore the window</a>.
 
  <li><p><a>Maximize the window</a>
-  of the <a>current top-level browsing context</a>.
+  of <var>session</var>&apos;s <a>current top-level browsing context</a>.
 
  <li><p>Return <a>success</a> with data set to the <a>WindowRect
-  object</a> for the <a>current top-level browsing
+  object</a> for the <var>session</var>&apos;s <a>current top-level browsing
   context</a>.
 </ol>
 </section> <!-- /Maximize Window -->
@@ -3973,30 +4244,33 @@ <h4><dfn>Minimize Window</dfn></h4>
  </tr>
 </table>
 
-<p class=note>The <a>Minimize Window</a> command
- invokes the window manager-specific “minimize” operation, if any,
- on the window containing the <a>current top-level browsing context</a>.
- This typically hides the window in the system tray.
+<p class=note>The <a>Minimize Window</a> command invokes the window
+ manager-specific “minimize” operation, if any, on the window
+ containing <var>session</var>&apos;s <a>current top-level browsing
+ context</a>.  This typically hides the window in the system tray.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>remote end</a> does not support
-  the <a>Minimize Window</a> command
-  for the <a>current top-level browsing context</a> for any reason,
-  return <a>error</a> with <a>error code</a> <a>unsupported operation</a>.
+ <li><p>If the <a>remote end</a> does not support the <a>Minimize
+  Window</a> command for <var>session</var>&apos;s <a>current top-level
+  browsing context</a> for any reason, return <a>error</a>
+  with <a>error code</a> <a>unsupported operation</a>.
 
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p><a>Fully exit fullscreen</a>.
 
  <li><p><a>Iconify the window</a>.
 
  <li><p>Return <a>success</a> with data set to the <a>WindowRect
-  object</a> for the <a>current top-level browsing
+  object</a> for the <var>session</var>&apos;s <a>current top-level browsing
   context</a>.
 </ol>
 </section> <!-- /Minimize Window -->
@@ -4015,25 +4289,30 @@ <h4><dfn>Fullscreen Window</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>If the <a>remote end</a> does not <a>support fullscreen</a>
   return <a>error</a> with <a>error code</a> <a>unsupported operation</a>.
 
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p><a>Restore the window</a>.
 
  <li><p>Call <a>fullscreen an element</a>
-  with the <a>current top-level browsing context</a>’s
-  <a>active document</a>’s <a>document element</a>.
+  with <var>session</var>&apos;s <a>current top-level browsing context</a>&apos;s
+  <a>active document</a>&apos;s <a>document element</a>.
+
+  <p class="note">The window is now in the <a>Fullscreen window state</a>.
 
-  <li><p>Return <a>success</a> with data set to the <a>WindowRect
-  object</a> for the <a>current top-level browsing
+ <li><p>Return <a>success</a> with data set to the <a>WindowRect
+  object</a> for the <var>session</var>&apos;s <a>current top-level browsing
   context</a>.
 </ol>
 </section> <!-- /Fullscreen Window -->
@@ -4047,86 +4326,177 @@ <h2>Elements</h2>
 <p>A <dfn data-lt="web elements">web element</dfn>
  is an abstraction used to identify an <a>element</a>
  when it is transported via the <a href="#protocol">protocol</a>,
- between <a>remote</a>- and <a>local</a> ends.
+ between <a>remote</a> and <a>local</a> ends.
 
 <p>The <dfn>web element identifier</dfn> is the string constant
  "<code>element-6066-11e4-a52e-4f735466cecf</code>".
 
-<p>Each <a>element</a> has an associated <dfn>web element
- reference</dfn> that uniquely identifies the <a>element</a> across
- all <a>browsing contexts</a>.  The <a>web element reference</a> for
- every <a>element</a> representing the same <a>element</a> must be the
- same. It must be a string, and should be the result of <a>generating
- a UUID</a>.
-
 <p>An ECMAScript <a>Object</a> <dfn>represents a web element</dfn>
  if it has a <a>web element identifier</a> <a>own property</a>.
 
-<p>Each <a>browsing context</a> has an associated <dfn>list of
- known elements</dfn>.
- When the <a>browsing context</a> is <a>discarded</a>,
- the <a>list of known elements</a> is discarded along with it.
+<p>The <dfn>WebDriver node id</dfn> is a globally unique string
+representing a handle to a DOM node in a specific
+WebDriver <a>session</a>.
 
-<p>To <dfn>get a known connected element</dfn> with
-argument <var>reference</var>, run the following steps:
-<ol>
-  <li>Let <var>element</var> be the item in the <a>current browsing
-  context</a>’s <a>list of known elements</a> for which the <a>web
-  element reference</a> is equal to <var>reference</var>, if such an
-  element exists. Otherwise return <a>error</a> with <a>error
-  code</a> <a>no such element</a>.
-  <li>If <var>element</var> <a>is stale</a>, return <a>error</a>
-  with <a>error code</a> <a>stale element reference</a>.
-  <li>Return <a>success</a> with <var>element</var>.
+<p>A <dfn>weak map</dfn> is a <a data-cite=infra>map</a> in which keys are held
+weakly i.e. items are removed if the key object is garbaged collected, and
+presence in the map does not prevent garbage collection. This acts as an
+alternative to defining properties directly on the key objects.
+
+<p class=note>Unlike the ECMAScript <a data-lt="ecmascript type">WeakMap</a>,
+a <a>weak map</a> can participate in the full set of operations available for
+a Map.
+
+<p>A WebDriver <a>session</a> has a <dfn>browsing context group node
+map</dfn>, which is a <a>weak map</a> between a <a>browsing context group</a>
+and a <a>node id map</a>.
+
+<p>A <dfn>node id map</dfn> is <a>weak map</a> between nodes and their
+corresponding <a>WebDriver node id</a>.
+
+<p>A WebDriver <a>session</a> has a <dfn>navigable seen nodes map</dfn>
+which is a <a>weak map</a> between a [=navigable=] and a set.
+
+<p>To <dfn>get a node</dfn> given <var>session</var>,
+<var>browsing context</var>, and <var>reference</var>:
+<ol class="algorithm">
+  <li>Let <var>browsing context group node map</var>
+  be <var>session</var>&apos;s <a>browsing context group node map</a>.
+
+  <li>Let <var>browsing context group</var> be <var>browsing
+  context</var>&apos;s <a>browsing context group</a>.
+
+  <li>If <var>browsing context group node map</var> does not
+  contain <var>browsing context group</var>, return null.
+
+  <li>Let <var>node id map</var> be <var>browsing context group node
+  map</var>[<var>browsing context group</var>].
+
+  <li>Let <var>node</var> be the entry in <var>node id map</var> whose
+  value is <var>reference</var>, if such an entry exists, or null
+  otherwise.
+
+  <li>Return <var>node</var>.
 </ol>
 
-<p>To <dfn>get or create a web element reference</dfn>
- with <a><var>element</var></a>:
+<p>To <dfn>get or create a node reference</dfn>
+given <var>session</var>, <var>browsing context</var>, and <var>node</var>:
+<ol class="algorithm">
+  <li>Let <var>browsing context group node map</var>
+  be <var>session</var>&apos;s <a>browsing context group node map</a>.
 
-<ol>
- <li><p>For each <var>known element</var>
-  of the <a>current browsing context</a>’s <a>list of known elements</a>:
+  <li>Let <var>browsing context group</var> be <var>browsing
+  context</var>&apos;s <a>browsing context group</a>.
 
-  <ol>
-   <li><p>If <var>known element</var> <a>equals</a> <var>element</var>,
-    return <a>success</a> with <var>known element</var>’s <a>web element reference</a>.
-  </ol>
+  <li>If <var>browsing context group node map</var> does not
+  contain <var>browsing context group</var>, set <var>browsing context
+  group node map</var>[<var>browsing context group</var>] to a new <a>weak map</a>.
+
+  <li>Let <var>node id map</var> be <var>browsing context group node
+  map</var>[<var>browsing context group</var>].
+
+  <li>If <var>node id map</var> does not contain <var>node</var>:
+
+    <ol>
+      <li>Let <var>node id</var> be a new globally unique string.
+
+      <li>Set <var>node id map</var>[<var>node</var>] to <var>node id</var>.
+
+      <li>Let <var>navigable</var> be <var>browsing
+      context</var>&apos;s <a>active document</a>&apos;s <a>node navigable</a>.
+
+      <li>Let <var>navigable seen nodes map</var>
+      be <var>session</var>&apos;s <a>navigable seen nodes map</a>.
+
+      <li>If <var>navigable seen nodes map</var> does not
+      contain <var>navigable</var>, set <var>navigable seen nodes
+      map</var>[<var>navigable</var>] to an empty set.
+
+      <li>Append <var>node id</var> to <var>navigable seen nodes
+      map</var>[<var>navigable</var>].
+    </ol>
+ <li><p>Return <var>node id map</var>[<var>node</var>].
+</ol>
+
+<p>A <dfn>node reference is known</dfn> given <var>session</var>, <var>browsing
+context</var>, and <var>reference</var> if the following steps return true:
+<ol class="algorithm">
+  <li>Let <var>navigable</var> be <var>browsing
+  context</var>&apos;s <a>active document</a>&apos;s <a>node navigable</a>.
+
+  <li>Let <var>navigable seen nodes map</var>
+  be <var>session</var>&apos;s <a>navigable seen nodes map</a>.
+
+  <li>If <var>navigable seen nodes map</var>
+  [=map/contains=] <var>navigable</var> and <var>navigable seen nodes
+  map</var>[<var>navigable</var>] [=set/contains=] <var>reference</var>,
+  return true, otherwise return false.
+</ol>
+
+<p>To <dfn>get a known element</dfn> given <var>session</var> and <var>reference</var>:
+
+<ol class="algorithm">
+  <li>If not <a>node reference is known</a> with <var>session</var>,
+  <var>session</var>&apos;s <a>current browsing context</a>,
+  and <var>reference</var> return
+  <a>error</a> with <a>error code</a> <a>no such element</a>.
+
+  <li>Let <var>node</var> be the result of <a>get a node</a> with
+  <var>session</var>, <var>session</var>&apos;s <a>current browsing
+  context</a>, and <var>reference</var>.
 
- <li><p>Add <var>element</var> to
-  the <a>list of known elements</a> of the <a>current browsing context</a>.
+  <li>If <var>node</var> is not null and <var>node</var> does not implement
+  {{Element}} return <a>error</a> with <a>error code</a> <a>no such element</a>.
+
+  <!-- Since we already checked for known references, null here means that
+  the object was GC'd -->
+
+  <li>If <var>node</var> is null or <var>node</var> <a>is stale</a> return
+  <a>error</a> with <a>error code</a> <a>stale element reference</a>.
+
+  <li>Return <a>success</a> with data <var>node</var>.
+</ol>
+
+<p>To <dfn>get or create a web element reference</dfn>
+ given <var>session</var> and <a><var>element</var></a>:
+
+<ol>
+  <li>Assert: <var>element</var> implements {{Element}}.
 
- <li><p>Return <a>success</a> with the
-  <var>element</var>’s <a>web element reference</a>.
+  <li>Return the result of <a>trying</a> to <a>get or create a node
+  reference</a>
+  given <var>session</var>, <var>session</var>&apos;s <a>current
+  browsing context</a>, and <var>element</var>.
 </ol>
 
-<p>The <dfn>web element reference object</dfn> for <var>element</var>
-is given by:
+<p>The <dfn>web element reference object</dfn> for <var>session</var>
+and <var>element</var> is:
 
 <ol>
  <li><p>Let <var>identifier</var> be the <a>web element identifier</a>.
 
  <li><p>Let <var>reference</var> be the result of <a>get or create a
- web element reference</a> given <var>element</var>.
+ web element reference</a> with <var>session</var> and <var>element</var>.
 
  <li><p>Return a JSON <a>Object</a> initialized with a property with
  name <var>identifier</var> and value <var>reference</var>.
 </ol>
 
-<p>When required to <dfn>deserialize a web element</dfn>
- by a JSON <a>Object</a> <var>object</var> that <a>represents a web element</a>:
+<p>To <dfn>deserialize a web element</dfn> by a
+ JSON <a>Object</a> <var>object</var> that <a>represents a web
+ element</a>:
 
 <ol>
  <li><p>If <var>object</var> has no <a>own property</a> <a>web element identifier</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>reference</var> be the result of
-  <a data-lt="getting a property">getting</a>
-  the <a>web element identifier</a> property
-  from <var>object</var>.
+  <a data-lt="getting a property">getting</a> the <a>web element
+  identifier</a> property from <var>object</var>.
 
  <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with argument <var>reference</var>.
+  of <a>trying</a> to <a>get a known element</a>
+  with <var>session</var> and <var>reference</var>.
 
  <li><p>Return <a>success</a> with data <var>element</var>.
 </ol>
@@ -4163,9 +4533,9 @@ <h2>Elements</h2>
 
 <dl class=subcategories>
  <dt><dfn data-lt="mutable form control element">Mutable form control elements</dfn>
- <dd><p>Denotes <a><code>input</code> elements</a>
-  that are <a>mutable</a> (e.g. that are not <a>read only</a> or <a>disabled</a>)
-  and whose <a><code>type</code> attribute</a>
+ <dd><p>Denotes [^input^] elements
+  that are <a>mutable</a> (e.g. that are not <a>read only</a> or
+  <a>disabled</a>) and whose [^input/type^] attribute
   is in one of the following states:
 
   <ul class=brief>
@@ -4197,8 +4567,8 @@ <h2>Elements</h2>
  is "<code>none</code>".
 
 <p>An <a>element</a> is to be considered <dfn>read only</dfn>
- if it is an <a><code>input</code> element</a>
- whose <a><code>readOnly</code> attribute</a> is set.
+ if it is an [^input^] element
+ whose [^input/readonly^] attribute is set.
 
 
 <section>
@@ -4221,13 +4591,13 @@ <h3>Interactability</h3>
 
 <p>A <dfn data-lt="keyboard-interactable">keyboard-interactable element</dfn>
  is any <a>element</a> that has a <a>focusable area</a>,
- is a <a><code>body</code> element</a>,
+ is a [^body^] element,
  or is the <a>document element</a>.
 
-<p>An <a>element</a>’s <dfn data-lt="center point">in-view center point</dfn>
+<p>An <a>element</a>&apos;s <dfn data-lt="center point">in-view center point</dfn>
  is the origin position of the rectangle
  that is the intersection between
- the element’s first {{DOMRect}} of {{Element/getClientRects()}}
+ the element&apos;s first {{DOMRect}} of {{Element/getClientRects()}}
  and the <a>initial viewport</a>.
  Given an <a>element</a> that is known to be <a>in view</a>,
  it can be calculated this way:
@@ -4262,6 +4632,22 @@ <h3>Interactability</h3>
  <li><p>Return the pair of (<var>x</var>, <var>y</var>).
 </ol>
 
+<p>An <a>element</a> |element| is <dfn>disabled</dfn> if the following steps
+ return true:
+
+<ol>
+ <li><p>If |element| is an <a>option</a> element or |element| is an <a>optgroup</a> element:
+  <ol>
+   <li><p>For each [=tree/inclusive ancestor=] |ancestor| of |element|:
+    <ol>
+     <li><p>If |ancestor| is an <a>optgroup</a> element or |ancestor| is a <a>select</a>
+      element, and |ancestor| is [=actually disabled=], return true.
+    </ol>
+   <li><p>Return false.
+  </ol>
+ <li><p>Return |element| is [=actually disabled=].
+</ol>
+
 <p>An <a>element</a> is <dfn>in view</dfn>
  if it is a member of its own <a>pointer-interactable paint tree</a>,
  given the pretense that its <a>pointer events are not disabled</a>.
@@ -4270,16 +4656,16 @@ <h3>Interactability</h3>
  if the <a>pointer-interactable paint tree</a>
  at its <a>center point</a> is empty,
  or the first element in this tree
- is not an <a>inclusive descendant</a> of itself.
+ is not an [=tree/inclusive descendant=] of itself.
 
 <aside class=example>
- <p>This ascertains if the <a>element</a>’s <a>in-view center point</a>
+ <p>This ascertains if the <a>element</a>&apos;s <a>in-view center point</a>
   would be possible to <a data-lt="element click">interact</a> with.
 
- <p>For example, the <a>paint tree</a> at this button’s
+ <p>For example, the <a>paint tree</a> at this button&apos;s
   <a>center point</a>, the red square, is not itself the button or
-  a <a>descendant</a> of the button.  In other words, it is not
-  an <em><a>inclusive descendant</a></em>.  This makes the
+  a [=tree/descendant=] of the button.  In other words, it is not
+  an <em>[=tree/inclusive descendant=]</em>.  This makes the
   button <em><a>obscured</a></em>:
 
  <p>
@@ -4295,12 +4681,12 @@ <h3>Interactability</h3>
    margin-top: -120px;"></div>
 
  <p>On the other hand, the <a>center point</a> of the following select
-  list is the third <a><code>option</code> element</a>, because unlike
+  list is the third [^option^] element, because unlike
   a drop-down list,
-  <code>&lt;select multiple&gt;</code>’s options
+  <code>&lt;select multiple&gt;</code>&apos;s options
   are individually visible and painted.
-  Because the option is a <em><a>descendant</a></em>
-  of the <a><code>select</code> element</a>,
+  Because the option is a <em>[=tree/descendant=]</em>
+  of the [^select^] element,
   it is <em>not</em> <a>obscured</a>:
 
  <p>
@@ -4312,14 +4698,14 @@ <h3>Interactability</h3>
   </select>
 </aside>
 
-<p>An <var><a>element</a></var>’s
+<p>An <var><a>element</a></var>&apos;s
  <dfn>pointer-interactable paint tree</dfn>
  is produced this way:
 
 <ol>
  <li><p>If <var>element</var> is <a>not in the same tree</a>
-  as the <a>current browsing context</a>’s <a>active document</a>,
-  return an empty sequence.
+  as <var>session</var>&apos;s <a>current browsing context</a>&apos;s
+  <a>active document</a>, return an empty sequence.
 
  <li><p>Let <var>rectangles</var> be
   the {{DOMRect}} sequence
@@ -4350,92 +4736,84 @@ <h3 id=shadow-root>Shadow Roots</h3>
  <p>The <dfn>shadow root identifier</dfn> is the string constant
   "<code>shadow-6066-11e4-a52e-4f735466cecf</code>".
 
- <p>Each <a>shadow root</a> has an associated <dfn>shadow root
-  reference</dfn> that uniquely identifies the <a>shadow root</a> across
-  all <a>browsing contexts</a>.  The <a>shadow root reference</a> for
-  every <a>shadow root</a> representing the same <a>shadow root</a> must be the
-  same. It must be a string, and should be the result of <a>generating
-  a UUID</a>.
-
  <p>An ECMAScript <a>Object</a> <dfn>represents a shadow root</dfn>
   if it has a <a>shadow root identifier</a> <a>own property</a>.
 
- <p>Each <a>browsing context</a> has an associated <dfn>list of
-  known shadow roots</dfn>.
-  When the <a>browsing context</a> is <a>discarded</a>,
-  the <a>list of known shadow roots</a> is discarded along with it.
+ <p>To <dfn>get a known shadow root</dfn> given <var>session</var>
+ and <var>reference</var>:
 
-  <p>To <dfn>get a known shadow root</dfn> with
-    argument <var>reference</var>, run the following steps:
+ <ol class="algorithm">
+  <li>If not <a>node reference is known</a> with <var>session</var>,
+  <var>session</var>&apos;s <a>current browsing context</a>,
+  and <var>reference</var> return
+  <a>error</a> with <a>error code</a> <a>no such shadow root</a>.
 
-   <ol>
-    <li>Let <var>shadow</var> be the item in the <a>current browsing
-    context</a>’s <a>list of known shadow roots</a> for which the <a>shadow
-    root reference</a> is equal to <var>reference</var>, if such a
-    shadow root exists. Otherwise return <a>error</a> with <a>error
-    code</a> <a>no such element</a>.
-    <li>If <var>shadow</var> <a>is detached</a>, return
-    <a>error</a> with <a>error code</a>
-    <a>detached shadow root</a>.
-    <li>Return <a>success</a> with <var>shadow</var>.
-   </ol>
+  <li>Let <var>node</var> be the result of <a>get a node</a> with
+  <var>session</var>, <var>session</var>&apos;s <a>current browsing
+  context</a>, and <var>reference</var>.
 
-   <p>To <dfn>get or create a shadow root reference</dfn>
-    with <a><var>shadow root</var></a>:
+  <li>If <var>node</var> is not null and <var>node</var> does not implement
+  {{ShadowRoot}} return <a>error</a> with <a>error code</a>
+  <a>no such shadow root</a>.
 
-   <ol>
-    <li><p>For each <var>known shadow root</var>
-     of the <a>current browsing context</a>’s <a>list of known shadow roots</a>:
+  <!-- Since we already checked for known references, null here means that
+  the object was GC'd -->
 
-     <ol>
-      <li><p>If <var>known shadow root</var> <a>equals</a> <var>shadow root</var>,
-       return <a>success</a> with <var>known shadow root</var>’s <a>shadow root reference</a>.
-     </ol>
+  <li>If <var>node</var> is null or <var>node</var> <a>is detached</a> return
+  <a>error</a> with <a>error code</a> <a>detached shadow root</a>.
+
+  <li>Return <a>success</a> with data <var>node</var>.
+</ol>
 
-    <li><p>Add <var>shadow</var> to
-     the <a>list of known shadow roots</a> of the <a>current browsing context</a>.
+ <p>To <dfn>get or create a shadow root reference</dfn>
+ given <var>session</var> and <var>shadow root</var>:
 
-    <li><p>Return <a>success</a> with the
-     <var>shadow</var>’s <a>shadow root reference</a>.
-   </ol>
+ <ol>
+   <li>Assert: <var>element</var> implements {{ShadowRoot}}.
+
+   <li>Return the result of <a>trying</a> to <a>get or create a node
+   reference</a>
+   with <var>session</var>, <var>session</var>&apos;s <a>current
+   browsing context</a>, and <var>element</var>.
+ </ol>
 
-   <p>The <dfn>shadow root reference object</dfn> for <var>shadow
-   root</var> is given by:
+ <p>The <dfn>shadow root reference object</dfn> for <var>session</var>
+ and <var>shadow root</var> is given by:
 
-   <ol>
-     <li><p>Let <var>identifier</var> be the <a>shadow root identifier</a>.
+ <ol>
+   <li><p>Let <var>identifier</var> be the <a>shadow root identifier</a>.
 
-     <li><p>Let <var>reference</var> be the result of <a>get or create a
-      shadow root reference</a> given <var>shadow root</var>.
+   <li><p>Let <var>reference</var> be the result of <a>get or create a
+    shadow root reference</a> with <var>session</var> and <var>shadow root</var>.
 
-   <li><p>Return a JSON <a>Object</a> initialized with a property with
-       name <var>identifier</var> and value <var>reference</var>.
-   </ol>
+ <li><p>Return a JSON <a>Object</a> initialized with a property with
+     name <var>identifier</var> and value <var>reference</var>.
+ </ol>
 
-   <p>When required to <dfn>deserialize a shadow root</dfn>
-    by a JSON <a>Object</a> <var>object</var> that <a>represents a shadow root</a>:
+ <p>When required to <dfn>deserialize a shadow root</dfn>
+  by a JSON <a>Object</a> <var>object</var> that <a>represents a shadow root</a>:
 
-   <ol>
-    <li><p>If <var>object</var> has no <a>own property</a> <a>shadow root identifier</a>,
-     return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+ <ol>
+  <li><p>If <var>object</var> has no <a>own property</a> <a>shadow root identifier</a>,
+   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
-    <li><p>Let <var>reference</var> be the result of
-     <a data-lt="getting a property">getting</a>
-     the <a>shadow root identifier</a> property
-     from <var>object</var>.
+  <li><p>Let <var>reference</var> be the result of
+   <a data-lt="getting a property">getting</a>
+   the <a>shadow root identifier</a> property
+   from <var>object</var>.
 
-    <li><p>Let <var>shadow</var> be the result
-     of <a>trying</a> to <a>get a known shadow root</a>
-     with argument <var>reference</var>.
+  <li><p>Let <var>shadow</var> be the result
+   of <a>trying</a> to <a>get a known shadow root</a>
+   with <var>session</var> and <var>reference</var>.
 
-    <li><p>Return <a>success</a> with data <var>shadow</var>.
-   </ol>
+  <li><p>Return <a>success</a> with data <var>shadow</var>.
+ </ol>
 
-   <p>A <a>shadow root</a> <dfn>is detached</dfn>
-    if its [=Node/node document=] is not the <a>active document</a>
-    or if the element node referred to as its <a>document fragment host</a>
-    <a>is stale</a>.
-   </section> <!-- Shadow Roots -->
+ <p>A <a>shadow root</a> <dfn>is detached</dfn>
+  if its [=Node/node document=] is not the <a>active document</a>
+  or if the element node referred to as its [=DocumentFragment/host=]
+  <a>is stale</a>.
+</section> <!-- Shadow Roots -->
 
 <section>
 <h3 id=element-retrieval>Retrieval</h3>
@@ -4448,40 +4826,52 @@ <h3 id=element-retrieval>Retrieval</h3>
  and <a>Find Elements From Shadow Root</a> <a>commands</a>
  allow lookup of individual elements and collections of elements.
  Element retrieval searches are performed
- using pre-order traversal of the document’s nodes
- that match the provided selector’s expression.
+ using pre-order traversal of the document&apos;s nodes
+ that match the provided selector&apos;s expression.
 
-<p>When required to <dfn>find</dfn> with arguments
- <var>start node</var>, <var>using</var> and <var>value</var>,
- a <a>remote end</a> must run the following steps:
+<p>When required to <dfn>find</dfn> given <var>session</var>, <var>start
+ node</var>, <var>using</var> and <var>value</var>, a <a>remote
+ end</a> must run the following steps:
 
 <ol>
- <li><p>Let <var>end time</var> be the current time plus
-  the <a>session implicit wait timeout</a>.
-
  <li><p>Let <var>location strategy</var> be equal to <var>using</var>.
 
  <li><p>Let <var>selector</var> be equal to <var>value</var>.
 
- <li><p>Let <var>elements returned</var> be the result of <a>trying</a> to call
-  the relevant <a>element location strategy</a> with arguments
-  <var>start node</var>, and <var>selector</var>.
+ <li><p>Let <var>timeout</var> be <var>session</var>&apos;s
+ <a>session timeouts</a>&apos; [=timeouts/implicit wait timeout=].
 
- <li>If
- a <a><code>DOMException</code></a>, <a><code>SyntaxError</code></a>,
- <a><code>XPathException</code></a>, or other error occurs during the
- execution of the <a>element location strategy</a>, return <a>error</a>
- <a>invalid selector</a>.
+ <li><p>Let <var>timer</var> be a new <a>timer</a>.
 
- <li><p>If <var>elements returned</var> is empty and the current time
-  is less than <var>end time</var> return to step 4. Otherwise,
-  continue to the next step.
+ <li><p>If <var>timeout</var> is not null:
 
- <li><p>Let <var>result</var> be an empty JSON <a>List</a>.
+  <ol>
+   <li><p><a>Start the timer</a> with <var>timer</var>
+   and <var>timeout</var>.
+ </ol>
+
+ <li><p>Let <var>elements returned</var> be an empty <a>List</a>.
+
+
+ <li><p>While <var>elements returned</var> is empty
+ and <var>timer<var>&apos;s [=timer/timeout fired flag=] is not set:
+
+  <ol>
+   <li><p>Set <var>elements returned</var> to the result of <a>trying</a> to call
+   the relevant <a>element location strategy</a> with arguments
+   <var>start node</var>, and <var>selector</var>.
+
+   <li>If a <a><code>DOMException</code></a>, <a><code>SyntaxError</code></a>,
+   <a><code>XPathException</code></a>, or other error occurs during the
+   execution of the <a>element location strategy</a>, return <a>error</a>
+   <a>invalid selector</a>.
+  </ol>
+
+ <li><p>Let <var>result</var> be an empty <a>List</a>.
 
  <li><p>For each <var>element</var> in <var>elements returned</var>,
-  append the <a>web element reference object</a> for <var>element</var>,
-  to <var>result</var>.
+ append the <a>web element reference object</a>
+ for <var>session</var> and <var>element</var>, to <var>result</var>.
 
  <li><p>Return <a>success</a> with data <var>result</var>.
 </ol>
@@ -4489,12 +4879,12 @@ <h3 id=element-retrieval>Retrieval</h3>
 <section>
 <h4>Locator strategies</h4>
 
-<p>An <dfn data-lt=strategy>element location strategy</dfn>
- is an <a>enumerated attribute</a>
- deciding what technique should be used
- to search for <a>elements</a> in the <a>current browsing context</a>.
- The following <dfn>table of location strategies</dfn> lists the keywords and
- states defined for this attribute:
+<p>An <dfn data-lt=strategy>element location strategy</dfn> is
+ an <a>enumerated attribute</a> deciding what technique should be used
+ to search for <a>elements</a> in <var>session</var>&apos;s <a>current
+ browsing context</a>.  The following <dfn>table of location
+ strategies</dfn> lists the keywords and states defined for this
+ attribute:
 
 <table class=simple>
  <tr>
@@ -4622,7 +5012,7 @@ <h5>Tag name</h5>
 
 <p>To find a <a>web element</a> with the <dfn>Tag Name</dfn>
  <a>strategy</a> return <a>success</a> with data set to the result of
- calling <a><code>getElementsByTagName</code></a> with
+ calling {{Element/getElementsByTagName()}} with
  <var>start node</var> as <a>this</a> and <var>selector</var> as the
  argument.
 
@@ -4695,10 +5085,10 @@ <h4><dfn>Find Element</dfn></h4>
 
 <aside class=note>
 <p>
-The <a>Find Element</a> <a>command</a>
-is used to find an <a>element</a> in the <a>current browsing context</a>
-that can be used as the <a>web element</a> context
-for future element-centric <a>commands</a>.
+The <a>Find Element</a> <a>command</a> is used to find
+an <a>element</a> in <var>session</var>&apos;s <a>current browsing
+context</a> that can be used as the <a>web element</a> context for
+future element-centric <a>commands</a>.
 
 <p>
 For example, consider this pseudo code
@@ -4711,37 +5101,39 @@ <h4><dfn>Find Element</dfn></h4>
 </code></pre>
 </aside>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>Let <var>location strategy</var> be the result
-  of <a>getting a property</a> called "<code>using</code>".
+ <li><p>Let <var>location strategy</var> be the result of <a>getting a
+  property</a> named "<code>using</code>" from <var>parameters</var>.
 
  <li><p>If <var>location strategy</var> is not present as a keyword in the
   <a>table of location strategies</a>, return <a>error</a> with
   <a>error code</a> <a>invalid argument</a>.
 
- <li><p>Let <var>selector</var> be the result
-  of <a>getting a property</a> called "<code>value</code>".
+ <li><p>Let <var>selector</var> be the result of <a>getting a
+  property</a> named "<code>value</code>" from <var>parameters</var>.
 
  <li><p>If <var>selector</var> is <a>undefined</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>start node</var> be
-  the <a>current browsing context</a>’s <a>document element</a>.
+  <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>document element</a>.
 
  <li><p>If <var>start node</var> is <a><code>null</code></a>,
   return <a>error</a> with <a>error code</a> <a>no such element</a>.
 
- <li><p>Let <var>result</var> be the result of <a>trying</a> to <a>Find</a>
-  with <var>start node</var>, <var>location strategy</var>,
-  and <var>selector</var>.
+ <li><p>Let <var>result</var> be the result of <a>trying</a>
+  to <a>Find</a> with <var>session</var>, <var>start
+  node</var>, <var>location strategy</var>, and <var>selector</var>.
 
  <li><p>If <var>result</var> is empty, return <a>error</a>
  with <a>error code</a> <a>no such element</a>. Otherwise, return the
@@ -4763,35 +5155,38 @@ <h4><dfn>Find Elements</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>Let <var>location strategy</var> be the result
-  of <a>getting a property</a> called "<code>using</code>".
+ <li><p>Let <var>location strategy</var> be the result of <a>getting a
+  property</a> named "<code>using</code>" from <var>parameters</var>.
 
  <li><p>If <var>location strategy</var> is not present as a keyword in the
   <a>table of location strategies</a>, return <a>error</a> with
   <a>error code</a> <a>invalid argument</a>.
 
- <li><p>Let <var>selector</var> be the result
-  of <a>getting a property</a> called "<code>value</code>".
+ <li><p>Let <var>selector</var> be the result of <a>getting a
+  property</a> named "<code>value</code>" from <var>parameters</var>.
 
  <li><p>If <var>selector</var> is <a>undefined</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>start node</var> be
-  the <a>current browsing context</a>’s <a>document element</a>.
+  <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>document
+  element</a>.
 
  <li><p>If <var>start node</var> is <a><code>null</code></a>,
   return <a>error</a> with <a>error code</a> <a>no such element</a>.
 
- <li>Return the result of <a>trying</a> to <a>Find</a> with
+ <li>Return the result of <a>trying</a> to <a>Find</a> with <var>session</var>,
   <var>start node</var>, <var>location strategy</var>, and <var>selector</var>.
 </ol>
 </section> <!-- /Find Elements -->
@@ -4810,34 +5205,36 @@ <h4><dfn>Find Element From Element</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>Let <var>location strategy</var> be the result
-  of <a>getting a property</a> called "<code>using</code>".
+ <li><p>Let <var>location strategy</var> be the result of <a>getting a
+  property</a> named "<code>using</code>" from <var>parameters</var>.
 
  <li><p>If <var>location strategy</var> is not present as a keyword in the
   <a>table of location strategies</a>, return <a>error</a> with
   <a>error code</a> <a>invalid argument</a>.
 
- <li><p>Let <var>selector</var> be the result
-  of <a>getting a property</a> called "<code>value</code>".
+ <li><p>Let <var>selector</var> be the result of <a>getting a
+  property</a> named "<code>value</code>" from <var>parameters</var>.
 
  <li><p>If <var>selector</var> is <a>undefined</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>start node</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+  of <a>trying</a> to <a>get a known element</a>
+  with <var>session</var> and <var>URL variables</var>["<code>element id</code>"].
 
  <li>Let <var>result</var> be the value of <a>trying</a> to <a>Find</a> with
-  <var>start node</var>, <var>location strategy</var>,
+  <var>session</var>, <var>start node</var>, <var>location strategy</var>,
   and <var>selector</var>.
 
  <li><p>If <var>result</var> is empty, return <a>error</a>
@@ -4860,33 +5257,35 @@ <h4><dfn>Find Elements From Element</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>Let <var>location strategy</var> be the result
-  of <a>getting a property</a> called "<code>using</code>".
+ <li><p>Let <var>location strategy</var> be the result of <a>getting a
+  property</a> named "<code>using</code>" from <var>parameters</var>.
 
  <li><p>If <var>location strategy</var> is not present as a keyword in the
   <a>table of location strategies</a>, return <a>error</a> with
   <a>error code</a> <a>invalid argument</a>.
 
- <li><p>Let <var>selector</var> be the result
-  of <a>getting a property</a> called "<code>value</code>".
+ <li><p>Let <var>selector</var> be the result of <a>getting a
+  property</a> named "<code>value</code>" from <var>parameters</var>.
 
  <li><p>If <var>selector</var> is <a>undefined</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>start node</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+  of <a>trying</a> to <a>get a known element</a>
+  with <var>session</var> and <var>URL variables</var>["<code>element id</code>"].
 
- <li>Return the result of <a>trying</a> to <a>Find</a> with
+ <li>Return the result of <a>trying</a> to <a>Find</a> with <var>session</var>,
   <var>start node</var>, <var>location strategy</var>, and <var>selector</var>.
 </ol>
 </section> <!-- /Find Elements From Element -->
@@ -4905,7 +5304,8 @@ <h4><dfn>Find Element From Shadow Root</dfn></h4>
   </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
   <li><p>Let <var>location strategy</var> be the result
@@ -4921,18 +5321,18 @@ <h4><dfn>Find Element From Shadow Root</dfn></h4>
   <li><p>If <var>selector</var> is <a>undefined</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
-  <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+  <li><p>If the <var>ssession</var>&apos;s <a>current browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
   <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
 
-  <li><p>Let <var>start node</var> be the result
-  of <a>trying</a> to <a>get a known shadow root</a>
-  with <a>url variable</a> <var>shadow id</var>.
+  <li><p>Let <var>start node</var> be the result of <a>trying</a>
+  to <a>get a known shadow root</a> with <var>session</var>
+  and <var>URL variables</var>["<code>shadow id</code>"].
 
   <li>Let <var>result</var> be the value of <a>trying</a> to <a>Find</a> with
-  <var>start node</var>, <var>location strategy</var>,
+  <var>session</var>, <var>start node</var>, <var>location strategy</var>,
   and <var>selector</var>.
 
   <li><p>If <var>result</var> is empty, return <a>error</a>
@@ -4955,7 +5355,8 @@ <h4><dfn>Find Elements From Shadow Root</dfn></h4>
   </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
   <li><p>Let <var>location strategy</var> be the result
@@ -4971,17 +5372,17 @@ <h4><dfn>Find Elements From Shadow Root</dfn></h4>
   <li><p>If <var>selector</var> is <a>undefined</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
-  <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+  <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
   <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
 
   <li><p>Let <var>start node</var> be the result
   of <a>trying</a> to <a>get a known shadow root</a>
-  with <a>url variable</a> <var>shadow id</var>.
+  with <var>session</var> and <var>URL variables</var>["<code>shadow id</code>"].
 
-  <li>Return the result of <a>trying</a> to <a>Find</a> with
+  <li>Return the result of <a>trying</a> to <a>Find</a> with <var>session</var>,
   <var>start node</var>, <var>location strategy</var>, and <var>selector</var>.
 </ol>
 </section> <!-- /Find Elements From Shadow Root -->
@@ -5000,21 +5401,24 @@ <h4><dfn>Get Active Element</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>active element</var> be the <a>active element</a>
-  of the <a>current browsing context</a>’s <a>document element</a>.
+  of <var>session</var>&apos;s <a>current browsing
+  context</a>&apos;s <a>document element</a>.
 
  <li><p>If <var>active element</var> is a non-null <a>element</a>,
   return <a>success</a> with data set to <a>web element reference
-  object</a> for <var>active element</var>.
+  object</a> for <var>session</var> and <var>active element</var>.
 
   <p>Otherwise, return <a>error</a> with <a>error code</a> <a>no such element</a>.
 </ol>
@@ -5034,26 +5438,27 @@ <h4><dfn>Get Element Shadow Root</dfn></h4>
   </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
-  <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+  <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
   <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
 
-  <li><p>Let <var>element</var> be the result
-    of <a>trying</a> to <a>get a known connected element</a>
-    with <a>url variable</a> <var>element id</var>.
+  <li><p>Let <var>element</var> be the result of <a>trying</a>
+    to <a>get a known element</a> with <var>session</var> and <var>URL
+    variables</var>[<var>element id</var>].
 
-  <li><p>Let <var>shadow root</var> be <var>element</var>'s <a>shadow root</a>.
+  <li><p>Let <var>shadow root</var> be <var>element</var>&apos;s <a>shadow root</a>.
 
   <li><p>If <var>shadow root</var> is null, return <a>error</a>
     with <a>error code</a> <a>no such shadow root</a>.
 
   <li><p>Let <var>serialized</var> be the <a>shadow root reference object</a>
-  for <var>shadow root</var>.
+  for <var>session</var> and <var>shadow root</var>.
 
   <li><p>Return <a>success</a> with data <var>serialized</var>.
 
@@ -5064,22 +5469,23 @@ <h4><dfn>Get Element Shadow Root</dfn></h4>
 <section>
 <h3>State</h3>
 
-<p>To <dfn>calculate the absolute position</dfn> of <a><var>element</var></a>:
+<p>To <dfn>calculate the absolute position</dfn>
+given <var>session</var> and <var>element</var>:
 
 <ol>
  <li><p>Let <var>rect</var> be the value
   returned by calling {{Element/getBoundingClientRect()}}.
 
  <li><p>Let <var>window</var> be the <a>associated window</a>
-  of <a>current top-level browsing context</a>.
+  of <var>session</var>&apos;s <a>current top-level browsing context</a>.
 
  <li><p>Let <var>x</var> be
   (<a>scrollX</a> of <var>window</var> +
-  <var>rect</var>’s <a>x coordinate</a>).
+  <var>rect</var>&apos;s <a>x coordinate</a>).
 
  <li><p>Let <var>y</var> be
   (<a>scrollY</a> of <var>window</var> +
-  <var>rect</var>’s <a>y coordinate</a>).
+  <var>rect</var>&apos;s <a>y coordinate</a>).
 
  <li><p>Return a pair of (<var>x</var>, <var>y</var>).
 </ol>
@@ -5089,32 +5495,32 @@ <h3>State</h3>
  run the following substeps:
 
 <ol>
- <li><p>If the <a>node</a>’s [=Node/node document=]
-  is not <var>other</var>’s [=Node/node document=],
+ <li><p>If the <a>node</a>&apos;s [=Node/node document=]
+  is not <var>other</var>&apos;s [=Node/node document=],
   return true.
 
- <li><p>Return true if the result of calling the <a>node</a>’s
-  <a>compareDocumentPosition</a> with <var>other</var> as argument
-  is <a>DOCUMENT_POSITION_DISCONNECTED</a> (1),
+ <li><p>Return true if the result of calling the <a>node</a>&apos;s
+  {{Node/compareDocumentPosition()}} with <var>other</var> as argument
+  is {{Node/DOCUMENT_POSITION_DISCONNECTED}} (1),
   otherwise return false.
 </ol>
 
-<p>An <a><var>element</var></a>’s <dfn>container</dfn> is:
+<p>An <a><var>element</var></a>&apos;s <dfn>container</dfn> is:
 
 <dl class=switch>
- <dt><code>option</code> element in a valid <a>element context</a>
+ <dt>[^option^] element in a valid <a>element context</a>
  <dt>[^optgroup^] element in a valid <a>element context</a>
- <dd><p>The <a><var>element</var></a>’s <a>element context</a>,
+ <dd><p>The <a><var>element</var></a>&apos;s <a>element context</a>,
   which is determined by:
 
   <ol>
    <li><p>Let <var>datalist parent</var> be
-    the first <a><code>datalist</code> element</a> reached
+    the first [^datalist^] element reached
     by traversing the tree in reverse order from <var>element</var>,
     or <a>undefined</a> if the root of the tree is reached.
 
    <li><p>Let <var>select parent</var> be the
-    first <a><code>select</code> element</a> reached
+    first [^select^] element reached
     by traversing the tree in reverse order from <var>element</var>,
     or <a>undefined</a> if the root of the tree is reached.
 
@@ -5123,7 +5529,7 @@ <h3>State</h3>
     Otherwise, the <a>element context</a> is <var>datalist parent</var>.
   </ol>
 
- <dt><a><code>option</code> element</a> in an invalid <a>element context</a>
+ <dt>[^option^] element in an invalid <a>element context</a>
  <dd><p>The element does not have a container.
 
  <dt>Otherwise
@@ -5147,34 +5553,37 @@ <h4><dfn>Is Element Selected</dfn></h4>
 <p class=note>
 The <a>Is Element Selected</a> <a>command</a>
 determines if the referenced <a>element</a> is selected or not.
-This operation only makes sense on <a data-lt="input element"><code>input</code> elements</a>
+This operation only makes sense on [^input^] elements
 of the <a>Checkbox</a>- and <a>Radio Button</a> states,
-or on <a><code>option</code> elements</a>.
+or on [^option^] elements.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+ <li><p>Let <var>element</var> be the result of <a>trying</a>
+  to <a>get a known element</a> with <var>session</var> and <var>URL
+  variables</var>[<var>element id</var>].
 
  <li><p>Let <var>selected</var> be the value
   corresponding to the first matching statement:
 
   <dl class=switch>
-   <dt><var>element</var> is an <a><code>input</code> element</a>
-    with a <a><code>type</code> attribute</a>
+   <dt><var>element</var> is an [^input^] element
+    with a [^input/type^] attribute
     in the <a>Checkbox</a>- or <a>Radio Button</a> state
-   <dd><p>The result of <var>element</var>’s <a>checkedness</a>.
+   <dd><p>The result of <var>element</var>&apos;s <a>checkedness</a>.
 
    <dt><var>element</var> is
-    an <a><code>option</code> element</a>
-   <dd><p>The result of <var>element</var>’s <a>selectedness</a>.
+    an [^option^] element
+   <dd><p>The result of <var>element</var>&apos;s <a>selectedness</a>.
 
    <dt>Otherwise
    <dd>False.
@@ -5198,29 +5607,33 @@ <h4><dfn>Get Element Attribute</dfn></h4>
   </tr>
 </table>
 
-<p>
-The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+ <li><p>Let <var>element</var> be the result of <a>trying</a>
+  to <a>get a known element</a> with <var>session</var> and <var>URL
+  variables</var>&apos; element id.
+
+ <li><p>Let <var>name</var> be <var>URL variables</var>["<code>name</code>"].
 
  <li>Let <var>result</var> be the result of the first matching condition:
 
    <dl class=switch>
     <dt>If <var>name</var> is a <a>boolean attribute</a>
     <dd><p>"<code>true</code>" (string)
-     if the <var>element</var> <a>has the attribute</a>,
+     if the <var>element</var> {{Element/hasAttribute()}} with <var>name</var>,
      otherwise <a><code>null</code></a>.
 
     <dt>Otherwise
-    <dd><p>The result of <a>getting an attribute by name</a>
+    <dd><p>The result of [=get an attribute by name|getting an attribute by name=]
      <var>name</var>.
    </dl>
 
@@ -5228,7 +5641,7 @@ <h4><dfn>Get Element Attribute</dfn></h4>
 </ol>
 
 <p class="note">Please note that the behavior of this command
- deviates from the behavior of <a>getAttribute</a> in [[DOM]],
+ deviates from the behavior of {{Element/getAttribute()}} in [[DOM]],
  which in the case of a set <a>boolean attribute</a>
  would return an empty string.
  The reason this command returns true as a string
@@ -5250,18 +5663,22 @@ <h4><dfn>Get Element Property</dfn></h4>
  </tr>
 </table>
 
-<p>
-The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+ <li><p>Let <var>element</var> be the result of <a>trying</a>
+  to <a>get a known element</a> with <var>session</var> and <var>URL
+  variables</var>&apos; element id.
+
+ <li><p>Let <var>name</var> <var>URL variables</var>["<code>name</code>"].
 
  <li><p>Let <var>property</var> be the result of calling
   the <a>Object.[[\GetProperty]]</a>(<var>name</var>) on <var>element</var>.
@@ -5287,26 +5704,28 @@ <h4><dfn>Get Element CSS Value</dfn></h4>
  </tr>
 </table>
 
-<p>
-The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+  of <a>trying</a> to <a>get a known element</a>
+  with <var>URL variables</var>["<code>element id</code>"].
 
  <li><p>Let <var>computed value</var> be the result of the first matching condition:
   <dl class="switch">
-   <dt><a>current browsing context</a>’s <a>document</a>
-   <a data-lt="document type">type</a> is not "<code>xml</code>"
-   <dd><a>computed value</a> of parameter <var>property name</var>
-    from <var>element</var>’s style declarations. <var>property name</var>
-    is obtained from <a>url variables</a>.
+   <dt><var>session</var>&apos;s <a>current browsing context</a>&apos;s
+   [=active document=]&apos;s [=Document/type=] is not "<code>xml</code>"
+   <dd><a>computed value</a> of parameter <var>URL
+    variables</var>["<code>property name</code>"]
+    from <var>element</var>&apos;s style declarations.
 
    <dt>Otherwise
    <dd> "" (empty string)
@@ -5333,8 +5752,8 @@ <h4><dfn>Get Element Text</dfn></h4>
 <aside class=note>
 <p>
 The <a>Get Element Text</a> <a>command</a>
-intends to return an <a>element</a>’s text “as rendered”.
-An <a>element</a>’s rendered text is also used
+intends to return an <a>element</a>&apos;s text “as rendered”.
+An <a>element</a>&apos;s rendered text is also used
 for locating [^a^] elements
 by their <a>link text</a> and <a>partial link text</a>.
 
@@ -5354,18 +5773,20 @@ <h4><dfn>Get Element Text</dfn></h4>
 with the <a>Unicode character property</a> "<code>WSpace=Y</code>" or "<code>WS</code>".
 [[UAX44]]
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is
-  an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+ <li><p>Let <var>element</var> be the result of <a>trying</a>
+  to <a>get a known element</a> with <var>session</var> and <var>URL
+  variables</var>[<var>element id</var>].
 
  <li><p>Let <var>rendered text</var> be the result of performing
   implementation-specific steps whose result is exactly the same as
@@ -5391,20 +5812,23 @@ <h4><dfn>Get Element Tag Name</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+  of <a>trying</a> to <a>get a known element</a>
+  with <var>URL variables</var>["<code>element id</code>"].
 
  <li><p>Let <var>qualified name</var> be the result of getting
-  <var>element</var>’s <a>tagName</a> content <a>attribute</a>.
+  <var>element</var>&apos;s {{Element/tagName}} IDL attribute.
 
  <li><p>Return <a>success</a> with data <var>qualified name</var>.
 </ol>
@@ -5428,49 +5852,52 @@ <h4><dfn>Get Element Rect</dfn></h4>
 <p>
 The <a>Get Element Rect</a> <a>command</a>
 returns the dimensions and coordinates of the given <a>web element</a>.
-The returned value is a dictionary with the following members:
+The returned value is an object with the following properties:
 
 <dl>
-<dt><dfn data-lt="elementrect-x">x</dfn>
+<dt>"<code>x</code>"
 <dd>
 X axis position of the top-left corner of the <a>web element</a>
-relative to the <a>current browsing context</a>’s
+relative to <var>session</var>&apos;s <a>current browsing context</a>&apos;s
 <a>document element</a> in <a>CSS pixels</a>.
 
-<dt><dfn data-lt="elementrect-y">y</dfn>
+<dt>"<code>y</code>"
 <dd>
 Y axis position of the top-left corner of the <a>web element</a>
-relative to the <a>current browsing context</a>’s
+relative to <var>session</var>&apos;s <a>current browsing context</a>&apos;s
 <a>document element</a> in <a>CSS pixels</a>.
 
-<dt><dfn data-lt="elementrect-height">height</dfn>
+<dt>"<code>height</code>"
 <dd>
-Height of the <a>web element</a>’s
+Height of the <a>web element</a>&apos;s
 <a>bounding rectangle</a> in <a>CSS pixels</a>.
 
-<dt><dfn data-lt="elementrect-width">width</dfn>
+<dt>"<code>width</code>"
 <dd>
-Width of the <a>web element</a>’s
+Width of the <a>web element</a>&apos;s
 <a>bounding rectangle</a> in <a>CSS pixels</a>.
 </dl>
 </aside>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+  of <a>trying</a> to <a>get a known element</a>
+  with <var>session</var> and <var>URL variables</var>["<code>element id</code>"].
 
- <li><p><a>Calculate the absolute position</a> of <var>element</var>
-  and let it be <var>coordinates</var>.
+ <li><p>Let <var>coordinates</var> be <a>calculate the absolute
+  position</a> with <var>session</var> and <var>element</var>.
 
- <li><p>Let <var>rect</var> be <var>element</var>’s
+ <li><p>Let <var>rect</var> be <var>element</var>&apos;s
   <a>bounding rectangle</a>.
 
  <li><p>Let <var>body</var> be a new JSON <a>Object</a> initialized with:
@@ -5483,10 +5910,10 @@ <h4><dfn>Get Element Rect</dfn></h4>
    <dd>The second value of <var>coordinates</var>.
 
    <dt>"<code>width</code>"
-   <dd>Value of <var>rect</var>’s <a>width dimension</a>.
+   <dd>Value of <var>rect</var>&apos;s <a>width dimension</a>.
 
    <dt>"<code>height</code>"
-   <dd>Value of <var>rect</var>’s <a>height dimension</a>.
+   <dd>Value of <var>rect</var>&apos;s <a>height dimension</a>.
   </dl>
 
  <li><p>Return <a>success</a> with data <var>body</var>.
@@ -5507,23 +5934,25 @@ <h4><dfn>Is Element Enabled</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>
-  and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+ <li><p>Let <var>element</var> be the result of <a>trying</a>
+  to <a>get a known element</a> with <var>session</var> and <var>URL
+  variables</var>[<var>element id</var>].
 
  <li><p>Let <var>enabled</var> be a boolean initially set to true
-  if the <a>current browsing context</a>’s
-  <a>document</a> <a data-lt="document type">type</a>
-  is not "<code>xml</code>".
+  if <var>session</var>&apos;s <a>current browsing context</a>&apos;s
+  [=active document=]&apos;s [=Document/type=] is not
+  "<code>xml</code>".
 
   <p>Otherwise, let <var>enabled</var> to false
    and jump to the last step of this algorithm.
@@ -5548,18 +5977,19 @@ <h4><dfn>Get Computed Role</dfn></h4>
     </tr>
   </table>
 
-  <p>The <a>remote end steps</a> are:
+  <p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
-  <ol>
-    <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
+ <ol>
+    <li><p>If <var>session</var>&apos;s <a>current browsing context</a> is <a>no longer open</a>,
         return <a>error</a> with <a>error code</a> <a>no such window</a>.
 
-    <li><p><a>Handle any user prompts</a>
-        and return its value if it is an <a>error</a>.
+    <li><p><a>Try</a> to <a>handle any user prompts</a>
+     with <var>session</var>.
 
     <li><p>Let <var>element</var> be the result
-        of <a>trying</a> to <a>get a known connected element</a>
-        with <a>url variable</a> <var>element id</var>.
+        of <a>trying</a> to <a>get a known element</a>
+        with <var>URL variables</var>["<code>element id</code>"].
 
     <li><p>Let <var>role</var> be the result of computing the <a>WAI-ARIA role</a> of <var>element</var>.
 
@@ -5581,21 +6011,24 @@ <h4><dfn>Get Computed Label</dfn></h4>
     </tr>
   </table>
 
-  <p>The <a>remote end steps</a> are:
+  <p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
     <ol>
       <li>
-        <p>If the <a>current browsing context</a> is <a>no longer open</a>,
+        <p>If <var>session</var>&apos;s <a>current browsing context</a> is <a>no longer open</a>,
           return <a>error</a> with <a>error code</a> <a>no such window</a>.
 
-      <li><p><a>Handle any user prompts</a>
-          and return its value if it is an <a>error</a>.
+      <li><p><a>Try</a> to <a>handle any user prompts</a>
+          with <var>session</var>.
 
-      <li><p>Let <var>element</var> be the result
-          of <a>trying</a> to <a>get a known connected element</a>
-          with <a>url variable</a> <var>element id</var>.
+      <li><p>Let <var>element</var> be the result of <a>trying</a>
+          to <a>get a known element</a> with <var>session</var>
+          and <var>URL variables</var>["<code>element id</code>"].
 
-      <li><p>Let <var>label</var> be the result of a <a>Accessible Name and Description Computation</a> for the <a>Accessible Name</a> of the <var>element</var>.
+      <li><p>Let <var>label</var> be the result of a <a>Accessible
+      Name and Description Computation</a> for the <a>Accessible
+      Name</a> of the <var>element</var>.
 
       <li><p>Return <a>success</a> with data <var>label</var>.
     </ol>
@@ -5620,23 +6053,23 @@ <h3 id=element-interaction>Interaction</h3>
  for an element that does not define its own <a>clear algorithm</a>,
  its <a>reset algorithm</a> must be invoked instead.
 
-<p>The <a>clear algorithm</a> for <a><code>input</code></a> elements
+<p>The <a>clear algorithm</a> for [^input^] elements
  is to set the <a>dirty value flag</a> and <a>dirty checkedness flag</a> back to false,
  set the <a>value</a> of the element to an empty string,
  set the <a>checkedness</a> of the element to true
- if the element has a <a><code>checked</code></a> content attribute and false if it does not,
+ if the element has a [^input/checked^] content attribute and false if it does not,
  empty the list of <a>selected files</a>,
  and then invoke the <a>value sanitization algorithm</a>
- iff the <a><code>type</code></a> attribute’s current state defines one.
+ iff the [^input/type^] attribute&apos;s current state defines one.
 
 <p>The <a>clear algorithm</a> for [^textarea^] elements
  is to set the <a>dirty value flag</a> back to false,
  and set the <a>raw value</a> of element to an empty string.
 
-<p>The <a>clear algorithm</a> for <a><code>output</code></a> elements
- is set the element’s <a>value mode flag</a> to default
- and then to set the element’s <code><a>textContent</a></code> IDL attribute
- to an empty string (thus clearing the element’s child nodes).
+<p>The <a>clear algorithm</a> for [^output^] elements
+ is set the element&apos;s <a>value mode flag</a> to default
+ and then to set the element&apos;s {{Node/textContent}} IDL attribute
+ to an empty string (thus clearing the element&apos;s child nodes).
 
 <section>
 <h4><dfn>Element Click</dfn></h4>
@@ -5660,85 +6093,95 @@ <h4><dfn>Element Click</dfn></h4>
 and clicks its <a>in-view center point</a>.
 
 <p>
-If the element’s <a>center point</a>
+If the element&apos;s <a>center point</a>
 is <a>obscured</a> by another element,
 an <a>element click intercepted</a> <a>error</a> is returned.
 If the element is outside the <a>viewport</a>,
 an <a>element not interactable</a> <a>error</a> is returned.
 </aside>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
-<ol class="algorithm">
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+<ol class=algorithm>
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>element</var> be the result of <a>trying</a>
-  to <a>get a known connected element</a> with argument <var>element id</var>.
+  to <a>get a known element</a> with <var>session</var>
+  and <var>element id</var>.
 
  <li><p>If the <var>element</var> is
-  an <a><code>input</code> element</a> in the <a>file upload state</a>
+  an [^input^] element in the <a>file upload state</a>
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p><a>Scroll into view</a> the <var>element</var>’s <a>container</a>.
+ <li><p><a>Scroll into view</a> the <var>element</var>&apos;s <a>container</a>.
 
- <li><p>If <var>element</var>’s <a>container</a> is still not <a>in view</a>,
+ <li><p>If <var>element</var>&apos;s <a>container</a> is still not <a>in view</a>,
   return <a>error</a> with <a>error code</a> <a>element not interactable</a>.
 
- <li><p>If <var>element</var>’s <a>container</a>
+ <li><p>If <var>element</var>&apos;s <a>container</a>
   is <a>obscured</a> by another <a>element</a>,
   return <a>error</a> with <a>error code</a> <a>element click intercepted</a>.
 
  <li><p>Matching on <var>element</var>:
 
   <dl class=switch>
-   <dt><a><code>option</code> element</a>
+   <dt>[^option^] element
    <dd>
      <ol>
-       <li><p>Let <var>parent node</var> be the <var>element</var>’s <a>container</a>.
+       <li><p>Let <var>parent node</var> be the <var>element</var>&apos;s <a>container</a>.
 
-       <li><p><a>Fire</a> a <a>mouseOver event</a> at <var>parent node</var>.
+       <li><p>[=fire an event|Fire=] a <a>mouseOver event</a> at <var>parent node</var>.
 
-       <li><p><a>Fire</a> a <a>mouseMove event</a> at <var>parent node</var>.
+       <li><p>[=fire an event|Fire=] a <a>mouseMove event</a> at <var>parent node</var>.
 
-       <li><p><a>Fire</a> a <a>mouseDown event</a> at <var>parent node</var>.
+       <li><p>[=fire an event|Fire=] a <a>mouseDown event</a> at <var>parent node</var>.
 
        <li><p>Run the <a>focusing steps</a> on <var>parent node</var>.
 
        <li><p>If <var>element</var> is not <a>disabled</a>:
 
         <ol>
-         <li><p><a>Fire</a> an <a><code>input</code></a> event at <var>parent node</var>.
+         <li><p>[=fire an event|Fire=] an <a><code>input</code></a> event at <var>parent node</var>.
 
          <li><p>Let <var>previous selectedness</var> be equal
           to <var>element</var> <a>selectedness</a>.
 
-         <li><p>If <var>element</var>’s <a>container</a>
+         <li><p>If <var>element</var>&apos;s <a>container</a>
           has the <a><code>multiple</code> attribute</a>,
-          toggle the <var>element</var>’s <a>selectedness</a> state
+          toggle the <var>element</var>&apos;s <a>selectedness</a> state
           by setting it to the opposite value of its current <a>selectedness</a>.
 
           <p>Otherwise,
-           set the <var>element</var>’s <a>selectedness</a> state to true.
+           set the <var>element</var>&apos;s <a>selectedness</a> state to true.
 
          <li><p>If <var>previous selectedness</var> is false,
-          <a>fire</a> a <a><code>change</code></a> event
+          [=fire an event|fire=] a <a><code>change</code></a> event
           at <var>parent node</var>.
         </ol>
 
-       <li><p><a>Fire</a> a <a>mouseUp event</a> at <var>parent node</var>.
+       <li><p>[=fire an event|Fire=] a <a>mouseUp event</a> at <var>parent node</var>.
 
-       <li><p><a>Fire</a> a <a>click event</a> at <var>parent node</var>.
+       <li><p>[=fire an event|Fire=] a <a>click event</a> at <var>parent node</var>.
      </ol>
 
    <dt>Otherwise
    <dd>
     <ol>
      <li><p>Let <var>input state</var> be the result of <a>get the
-     input state</a> given <a>current session</a> and <a>current
-     top-level browsing context</a>.
+     input state</a> given <var>session</var>
+     and <var>session</var>&apos;s <a>current top-level browsing
+     context</a>.
+
+     <li><p>Let <var>actions options</var> be a new <a>actions options</a>
+     with the <a>is element origin</a> steps set to <a>represents a web
+     element</a>, and the <a>get element origin</a> steps set
+     to <a>get a WebElement origin</a>.
 
      <li><p>Let <var>input id</var> be a the result of <a>generating a
      UUID</a>.
@@ -5750,10 +6193,10 @@ <h4><dfn>Element Click</dfn></h4>
      state</var>, <var>input id</var> and <var>source</var>.
 
      <li><p>Let <var>click point</var> be
-      the <var>element</var>’s <a>in-view center point</a>.
+      the <var>element</var>&apos;s <a>in-view center point</a>.
 
      <li><p>Let <var>pointer move action</var> be an <a>action
-      object</a> constructed with arguments <var>input id</code>,
+      object</a> constructed with arguments <var>input id</var>,
       "<code>pointer</code>", and "<code>pointerMove</code>".
 
      <li><p><a>Set a property</a> <code>x</code> to <code>0</code> on
@@ -5766,7 +6209,7 @@ <h4><dfn>Element Click</dfn></h4>
       to <var>element</var> on <var>pointer move action</var>.
 
      <li><p>Let <var>pointer down action</var> be an <a>action
-      object</a> constructed with arguments <var>input id</code>,
+      object</a> constructed with arguments <var>input id</var>,
       "<code>pointer</code>", and "<code>pointerDown</code>".
 
      <li><p><a>Set a property</a> <code>button</code>  to <code>0</code>
@@ -5774,18 +6217,18 @@ <h4><dfn>Element Click</dfn></h4>
 
      <li><p>Let <var>pointer up action</var> be an <a>action
       object</a> constructed with arguments <var>input id</var>,
-      "<code>mouse</code>", and "<code>pointerUp</code>" as arguments.
+      "<code>pointer</code>", and "<code>pointerUp</code>" as arguments.
 
      <li><p><a>Set a property</a> <code>button</code>
       to <code>0</code> on <var>pointer up action</var>.
 
      <li><p>Let <var>actions</var> be the list «<var>pointer move
-     action</var>, <var>pointer down action</var>, <var>pointer move
+     action</var>, <var>pointer down action</var>, <var>pointer up
      action</var>».
 
      <li><p><a>Dispatch a list of actions</a> with <var>input
-     state</var>, <var>actions</var>, and <a>current browsing
-     context</a>.
+     state</var>, <var>actions</var>, <var>session</var>&apos;s <a>current
+     browsing context</a>, and <var>actions options</var>.
 
      <li><p><a>Remove an input source</a> with <var>input state</var>
      and <var>input id</var>.
@@ -5808,7 +6251,8 @@ <h4><dfn>Element Click</dfn></h4>
   steps can return immediately, and the next step will also return
   immediately.
 
- <li><p><a>Try</a> to <a>wait for navigation to complete</a>.
+ <li><p><a>Try</a> to <a>wait for navigation to complete</a>
+ with <var>session</var>.
 
  <li><p><a>Try</a> to run the <a>post-navigation checks</a>.
 
@@ -5833,12 +6277,12 @@ <h4><dfn>Element Clear</dfn></h4>
 <p>To <dfn>clear a content editable element</dfn>:
 
 <ol class="algorithm">
- <li><p>If <var>element</var>’s <a><code>innerHTML</code> IDL attribute</a>
+ <li><p>If <var>element</var>&apos;s <a><code>innerHTML</code> IDL attribute</a>
   is an empty string do nothing and return.
 
  <li><p>Run the <a>focusing steps</a> for <var>element</var>.
 
- <li><p>Set <var>element</var>’s <a><code>innerHTML</code> IDL attribute</a>
+ <li><p>Set <var>element</var>&apos;s <a><code>innerHTML</code> IDL attribute</a>
   to an empty string.
 
  <li><p>Run the <a>unfocusing steps</a> for the <var>element</var>.
@@ -5850,8 +6294,8 @@ <h4><dfn>Element Clear</dfn></h4>
  <li><p>Let <var>empty</var> be the result of the first matching condition:
 
   <dl class=switch>
-   <dt><var>element</var> is an <a><code>input</code> element</a>
-    whose <a><code>type</code> attribute</a> is in the <a>File Upload state</a>
+   <dt><var>element</var> is an [^input^] element
+    whose [^input/type^] attribute is in the <a>File Upload state</a>
    <dd>True if the list of <a>selected files</a> has a length of 0,
     and false otherwise.
 
@@ -5872,26 +6316,41 @@ <h4><dfn>Element Clear</dfn></h4>
  <li><p>Invoke the <a>unfocusing steps</a> for the <var>element</var>.
 </ol>
 
-<p>The <a>remote end steps</a> for <a>Element Clear</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
-<ol class="algorithm">
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+<ol class=algorithm>
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with argument <var>element id</var>.
+  of <a>trying</a> to <a>get a known element</a>
+  with <var>session</var> and <var>element id</var>.
 
  <li><p>If <var>element</var> is not <a>editable</a>,
   return an <a>error</a> with <a>error code</a> <a>invalid element state</a>.
 
  <li><p><a>Scroll into view</a> the <var>element</var>.
 
- <li><p>Wait in an implementation-specific way
-  up to the <a>session implicit wait timeout</a>
-  for <var>element</var> to become <a>interactable</a>.
+ <li><p>Let <var>timeout</var> be <var>session</var>&apos;s
+ <a>session timeouts</a>&apos; [=timeouts/implicit wait timeout=].
+
+ <li><p>Let <var>timer</var> be a new <a>timer</a>.
+
+ <li><p>If <var>timeout</var> is not null:
+
+  <ol>
+   <li><p><a>Start the timer</a> with <var>timer</var>
+   and <var>timeout</var>.
+ </ol>
+
+ <li><p>Wait for <var>element</var> to become <a>interactable</a>,
+ or <var>timer</var>&apos;s [=timer/timeout fired flag=] to be set,
+ whichever occurs first.
 
  <li><p>If <var>element</var> is not <a>interactable</a>,
   return <a>error</a> with <a>error code</a> <a>element not interactable</a>.
@@ -5936,8 +6395,8 @@ <h4><dfn>Element Send Keys</dfn></h4>
 
 <p>
 A <dfn>non-typeable form control</dfn>
-is an <a><code>input</code> element</a>
-whose <a><code>type</code> attribute</a> state
+is an [^input^] element
+whose [^input/type^] attribute state
 causes the primary input mechanism
 not to be through means of a keyboard, whether virtual or physical.
 
@@ -5946,7 +6405,7 @@ <h4><dfn>Element Send Keys</dfn></h4>
 <a>Non-typeable form controls</a> means to refer to
 form control elements rendered by the user agent
 as something other than as a text input control.
-When targetting an <a><code>input</code> element</a>
+When targetting an [^input^] element
 in the <a><code>color</code> state</a>
 being presented as a color wheel,
 <a data-lt="Element Send Keys">interaction</a> with it will be simulated,
@@ -5955,8 +6414,8 @@ <h4><dfn>Element Send Keys</dfn></h4>
 <p>
 Other examples of <a>non-typeable form controls</a> include
 form controls interacted with via system-native widgets,
-such as a scrolled option list for <a><code>select</code> elements</a>
-and a number keypad for <a><code>input</code> elements</a>
+such as a scrolled option list for [^select^] elements
+and a number keypad for [^input^] elements
 in the <a><code>number</code> state</a> on non-desktop devices.
 </div>
 
@@ -5972,6 +6431,11 @@ <h4><dfn>Element Send Keys</dfn></h4>
  <li><p>If <var>source</var> is not a <a>key input source</a>
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
+ <li><p>Let <var>actions options</var> be a new <a>actions options</a>
+  with the <a>is element origin</a> steps set to <a>represents a web
+  element</a>, and the <a>get element origin</a> steps set
+  to <a>get a WebElement origin</a>.
+
  <li><p>For each <var>entry key</var>
   in the lexically sorted keys of <var>undo actions</var>:
 
@@ -5987,8 +6451,8 @@ <h4><dfn>Element Send Keys</dfn></h4>
    <li><p>Let <var>actions</var> be the list «<var>action</var>»
 
    <li><p><a>Dispatch a list of actions</a> with <var>input
-   state</var>, <var>actions</var>, and <a>current browsing
-   context</a>.
+   state</var>, <var>actions</var>, <var>browsing context</var>,
+   and <a>actions options</a>.
   </ol>
 </ol>
 
@@ -5997,17 +6461,22 @@ <h4><dfn>Element Send Keys</dfn></h4>
  and the <a>code</a> is not <a>undefined</a>.
 
 <p>The <dfn>shifted state</dfn> for <var>keyboard</var> is the value
- of <var>keyboard</var>’s <code>shift</code> property.
+ of <var>keyboard</var>&apos;s <code>shift</code> property.
 
 <p>To <dfn>dispatch the events for a typeable string</dfn>
 given <var>input state</var>, <var>input id</var>, <var>source</var>,
 <var>text</var>, and <var>browsing context</var>:
 
 <ol class="algorithm">
+ <li><p>Let <var>actions options</var> be a new <a>actions options</a>
+  with the <a>is element origin</a> steps set to <a>represents a web
+  element</a>, and the <a>get element origin</a> steps set
+  to <a>get a WebElement origin</a>.
+
  <li>For each <var>char</var> of <var>text</var>:
 
   <ol>
-   <li><p>Let <var>global key state</a> be the result of <a>get the
+   <li><p>Let <var>global key state</var> be the result of <a>get the
    global key state</a> with <var>input state</var>.
 
    <li><p>If <var>char</var> is a <a>shifted character</a>, and
@@ -6022,8 +6491,7 @@ <h4><dfn>Element Send Keys</dfn></h4>
       <li><p>Let <var>actions</var> be the list «<var>action</var>».
 
       <li><p><a>Dispatch a list of actions</a> with <var>input
-      state</var>, <var>actions</var>, and <a>current browsing
-      context</a>.
+      state</var>, <var>actions</var>, and <var>browsing context</var>.
     </ol>
 
    <li><p>If <var>char</var> is not a <a>shifted character</a>
@@ -6038,8 +6506,8 @@ <h4><dfn>Element Send Keys</dfn></h4>
      <li><p>Let <var>tick actions</var> be the list «<var>action</var>».
 
      <li><p><a>Dispatch a list of actions</a> with <var>input
-     state</var>, <var>actions</var>, and <a>current browsing
-     context</a>.
+     state</var>, <var>actions</var>, <var>browsing context</var>,
+     and <var>actions options</var>.
     </ol>
 
    <li><p>Let <var>keydown action</var> be an <a>action object</a>
@@ -6053,11 +6521,11 @@ <h4><dfn>Element Send Keys</dfn></h4>
    with the subtype property changed to "<code>keyUp</code>".
 
    <li><p>Let <var>actions</var> be the list «<var>keydown
-   action</var>, </var>keyup action</var>»
+   action</var>, <var>keyup action</var>».
 
    <li><p><a>Dispatch a list of actions</a> with <var>input
-   state</var>, <var>actions</var>, and <a>current browsing
-   context</a>.
+   state</var>, <var>actions</var>, <var>browsing context</var>,
+   and <var>actions options</var>.
   </ol>
 </ol>
 
@@ -6089,7 +6557,7 @@ <h4><dfn>Element Send Keys</dfn></h4>
 
 <p>To <dfn>dispatch actions for a string</dfn> given <var>input
 state</var>, <var>input id</var>, <var>source</var>,
-<var>text</var>, and <var>browsing context</var>:
+<var>text</var>, <var>browsing context</var>, and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Let <var>clusters</var> be an array created by
@@ -6140,8 +6608,8 @@ <h4><dfn>Element Send Keys</dfn></h4>
    action</var>»
 
    <li><p><a>Dispatch a list of actions</a> with <var>input
-   state</var>, <var>actions</var>, and <a>current browsing
-   context</a>.
+   state</var>, <var>actions</var>, <var>browsing
+   context</var>, and <var>actions options</var>.
 
    <li><p>Add an entry to <var>undo actions</var> with
    key <var>cluster</var> and value being a copy of <var>keydown
@@ -6181,42 +6649,58 @@ <h4><dfn>Element Send Keys</dfn></h4>
  and <var>source</var>, <var>current typeable text</var>,
  and <var>browsing context</var>.
 
- <li><p><a>Try</a> to <a>clear the modifier key state</a> with arguments
+ <li><p><a>Try</a> to <a>clear the modifier key state</a> with
  <var>input state</var>, <var>input id</var>, <var>source</var>,
  <var>undo actions</var>, and <var>browsing context</var>.
 </ol> <!-- /create actions from a string -->
 
-<p>The <a>remote end steps</a> for <a>Element Send Keys</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol class="algorithm">
  <li><p>Let <var>text</var> be the result
-  of <a>getting a property</a> called "<code>text</code>"
-  from the <var>parameters</var> argument.
+  of <a>getting a property</a> named "<code>text</code>"
+  from <var>parameters</var>.
 
  <li><p>If <var>text</var> is not a <a>String</a>,
   return an <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>Let <var>element</var> be the result
-  of <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+ <li><p>Let <var>element</var> be the result of <a>trying</a>
+  to <a>get a known element</a> with <var>session</var> and <var>URL
+  variables</var>[<var>element id</var>].
 
  <li><p>Let <var>file</var> be true if <var>element</var> is
-   <a><code>input</code> element</a> in the <a>file upload state</a>, or false
+   [^input^] element in the <a>file upload state</a>, or false
    otherwise.
 
- <li><p>If <var>file</var> is false or the <a>current session</a>’s
+ <li><p>If <var>file</var> is false or the <a>session</a>&apos;s
   <a>strict file interactability</a>, is true run the following substeps:
   <ol>
    <li><p><a>Scroll into view</a> the <var>element</var>.
 
-   <li><p>Wait in an implementation-specific way up to the <a>session
-    implicit wait timeout</a> for <var>element</var> to
-    become <a>keyboard-interactable</a>.
+   <li><p>Let <var>timeout</var> be <var>session</var>&apos;s
+   <a>session timeouts</a>&apos; [=timeouts/implicit wait
+   timeout=].
+
+   <li><p>Let <var>timer</var> be a new <a>timer</a>.
+
+   <li><p>If <var>timeout</var> is not null:
+
+    <ol>
+     <li><p><a>Start the timer</a> with <var>timer</var>
+     and <var>timeout</var>.
+    </ol>
+
+   <li><p>Wait for <var>element</var> to
+   become <a>keyboard-interactable</a>, or <var>timer</var>&apos;s
+   [=timer/timeout fired flag=] to be set, whichever occurs first.
 
    <li><p>If <var>element</var> is not <a>keyboard-interactable</a>,
     return <a>error</a> with <a>error code</a> <a>element not interactable</a>.
@@ -6237,7 +6721,7 @@ <h4><dfn>Element Send Keys</dfn></h4>
       return an <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
      <li><p>Let <var>multiple</var> equal the result
-      of calling <code><a>hasAttribute</a>("multiple")</code>
+      of calling {{Element/hasAttribute()}} with "multiple"
       on <var>element</var>.
 
      <li><p>if <var>multiple</var> is <code>false</code> and the
@@ -6250,11 +6734,11 @@ <h4><dfn>Element Send Keys</dfn></h4>
 
      <li><p>Complete implementation specific steps
       equivalent to setting the <a>selected files</a>
-      on the <a><code>input</code></a>.
+      on the [^input^] element.
       If <var>multiple</var> is <code>true</code>
-      <var>files</var> are be appended to <var>element</var>’s <a>selected files</a>.
+      <var>files</var> are be appended to <var>element</var>&apos;s <a>selected files</a>.
 
-     <li><p><a>Fire</a> these events in order on <var>element</var>:
+     <li><p>[=fire an event|Fire=] these events in order on <var>element</var>:
       <ol>
        <li><a><code>input</code></a>
        <li><a><code>change</code></a>
@@ -6294,7 +6778,7 @@ <h4><dfn>Element Send Keys</dfn></h4>
      <ol>
        <li><p>If <var>element</var> does not currently have focus,
         let <var>current text length</var> be the
-        [=string/length=] of <var><a>element</a></var>’s <a>API value</a>.
+        [=string/length=] of <var><a>element</a></var>&apos;s <a>API value</a>.
 
       <li><p>Set the text insertion caret using <a>set selection range</a>
        using <var>current text length</var> for both the <code>start</code>
@@ -6303,9 +6787,10 @@ <h4><dfn>Element Send Keys</dfn></h4>
     </dd>
   </dl>
 
- <li><p>Let <var>input state</var> be the result of <a>get the
- input state</a> with <a>current session</a> and <a>current
- top-level browsing context</a>.
+ <li><p>Let <var>input state</var> be the result of <a>get the input
+ state</a> with <var>session</var>
+ and <var>session</var>&apos;s <a>current top-level browsing
+ context</a>.
 
  <li><p>Let <var>input id</var> be a the result of <a>generating a
  UUID</a>.
@@ -6318,7 +6803,8 @@ <h4><dfn>Element Send Keys</dfn></h4>
 
  <li><p><a>Dispatch actions for a string</a> with arguments <var>input
  state</var>, <var>input id</var>, and <var>source</var>,
-<var>text</var>, and <a>current browsing  context</a>.
+<var>text</var>, and <var>session</var>&apos;s <a>current browsing
+context</a>.
 
  <li><p><a>Remove an input source</a> with <var>input state</var>
  and <var>input id</var>.
@@ -6347,17 +6833,20 @@ <h3><dfn>Get Page Source</dfn></h3>
 </table>
 
 <p class=note>
-The <a>Get Page Source</a> <a>command</a>
-returns a string serialization of the DOM
-of the <a>current browsing context</a> <a>active document</a>.
+The <a>Get Page Source</a> <a>command</a> returns a string
+serialization of the DOM of <var>session</var>&apos;s <a>current browsing
+context</a> <a>active document</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p>Let <var>source</var> be the result of invoking the
   <a>fragment serializing algorithm</a> on a fictional node whose only
@@ -6366,7 +6855,7 @@ <h3><dfn>Get Page Source</dfn></h3>
   to be thrown, let <var>source</var> be <a><code>null</code></a>.
 
  <li><p>Let <var>source</var> be the result of <a>serializing to string</a>
-  the <a>current browsing context</a> <a>active document</a>,
+  <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>active document</a>,
   if <var>source</var> is <a><code>null</code></a>.
 
  <li><p>Return <a>success</a> with data <var>source</var>.
@@ -6384,20 +6873,20 @@ <h3>Executing Script</h3>
 
 <ul>
 <li><a>initial value</a> of the <code>toString</code> <a>own property</a> is "<code>Arguments</code>"
-<li>instance of <a>Array</a>
-<li>instance of <a><code>FileList</code></a>
-<li>instance of <a><code>HTMLAllCollection</code></a>
-<li>instance of <a><code>HTMLCollection</code></a>
-<li>instance of <a><code>HTMLFormControlsCollection</code></a>
-<li>instance of <a><code>HTMLOptionsCollection</code></a>
+<li>instance of {{Array}}
+<li>instance of {{DOMTokenList}}
+<li>instance of {{FileList}}
+<li>instance of {{HTMLAllCollection}}
+<li>instance of {{HTMLCollection}}
+<li>instance of {{HTMLFormControlsCollection}}
+<li>instance of {{HTMLOptionsCollection}}
 <li>instance of {{NodeList}}
 </ul>
 
-<p>
-When required to <dfn>JSON deserialize</dfn>
-with argument <var>value</var>
-and optional argument <var>seen</var>,
-a <a>remote end</a> must run the following steps:
+<p>To <dfn>JSON deserialize</dfn>
+given <var>session</var>, <var>value</var> and optional
+argument <var>seen</var>, a <a>remote end</a> must run the following
+steps:
 
 <ol>
  <li><p>If <var>seen</var> is not provided,
@@ -6423,70 +6912,78 @@ <h3>Executing Script</h3>
    <dd><p>Return the <a data-lt="deserialize a shadow root">deserialized</a>
     <a>shadow root</a> of <var>value</var>.
 
+   <dt><a>Object</a> that <a>represents a web frame</a>
+   <dd><p>Return the <a data-lt="deserialize a web frame">deserialized</a>
+    <a>web frame</a> of <var>value</var>.
+
+   <dt><a>Object</a> that <a>represents a web window</a>
+   <dd><p>Return the <a data-lt="deserialize a web window">deserialized</a>
+    <a>web window</a> of <var>value</var>.
+
    <dt>instance of <a>Array</a>
    <dt>instance of <a>Object</a>
-   <dd><p>Return the result of running the <a>clone an object</a> algorithm
-    with arguments <var>value</var> and <var>seen</var>,
+   <dd><p>Return <a>clone an object</a> algorithm
+    with <var>session</var>, <var>value</var> and <var>seen</var>,
     and the <a>JSON deserialize</a> algorithm as the clone algorithm.
   </dl>
 </ol>
 
-<p>To perform a <dfn>JSON clone</dfn>
- return the result of calling the <a>internal JSON clone algorithm</a>
- with arguments <var>value</var> and an empty <a>List</a>.
+<p>To <dfn>JSON clone</dfn> given <var>session</var>
+ and <var>value</var>, return the result of <a>internal JSON clone</a>
+ with <var>session</var>, <var>value</var> and an empty <a>List</a>.
 
-<p>When required to run the <dfn>internal JSON clone algorithm</dfn>
- with arguments <var>value</var> and <var>seen</var>,
- a <a>remote end</a> must return the value
- of the first matching statement, matching on <var>value</var>:
+<p>To <dfn>internal JSON clone</dfn>
+ given <var>session</var>, <var>value</var> and <var>seen</var>,
+ return the value of the first matching statement, matching
+ on <var>value</var>:
 
 <dl class=switch>
  <dt><a>undefined</a>
  <dt><a><code>null</code></a>
- <dd><p><a>Success</a> with data <a><code>null</code></a>.
+ <dd><p>Return <a>success</a> with data <a><code>null</code></a>.
 
  <dt>type <a>Boolean</a>
  <dt>type <a>Number</a>
  <dt>type <a>String</a>
- <dd><p><a>Success</a> with data <var>value</var>.
-
- <dt>a <a>collection</a>
- <dd>
-  <ol>
-   <li><p>Let <var>result list</var> be an empty list.
-
-   <li><p>For each <var>item</var> of <var>value</var>,
-    add the result of <a>trying</a> to <a>clone an object</a>
-    with arguments <var>item</var> and <var>seen</var>
-    and the <a>internal JSON clone algorithm</a> as the <var>clone algorithm</var>
-    to <var>result list</var>.
-
-   <li><p>Return <a>success</a> with <var>result list</var>.
-  </ol>
+ <dd><p>Return <a>success</a> with data <var>value</var>.
 
- <dt>instance of <a>element</a>
+ <dt>instance of {{Element}}
  <dd><p>If the <var>element</var> <a>is stale</a>,
   return <a>error</a> with <a>error code</a> <a>stale element reference</a>.
 
-  <p>Otherwise return <a>success</a> with data set to the <var>web
-  element reference object</var> for <var>value</var>.
+  <p>Otherwise:
+  <ol>
+   <li><p>Let <var>reference</var> be the <a>web element reference object</a>
+    for <var>session</var> and <var>value</var>.
+
+   <li><p>Return <a>success</a> with data <var>reference</var>.
+  </ol>
 
- <dt>instance of <a>shadow root</a>
+ <dt>instance of {{ShadowRoot}}
  <dd><p>If the <var>shadow root</var> <a>is detached</a>,
   return <a>error</a> with <a>error code</a> <a>detached shadow root</a>.
 
-  <p>Otherwise return <a>success</a> with data set to the <var>shadow
-  root reference object</var> for <var>value</var>.
+  <p>Otherwise:
+  <ol>
+   <li><p>Let <var>reference</var> be the <a>shadow root reference object</a>
+    for <var>session</var> and <var>value</var>.
+
+    <li><p>Return <a>success</a> with data <var>reference</var>.
+  </ol>
 
- <dt>a <a><code>WindowProxy</code></a> object
+ <dt>a {{WindowProxy}} object
  <dd><p>If the associated <a>browsing context</a>
   of the <a><code>WindowProxy</code></a> object
-  in <var>value</var> has been <a>discarded</a>,
+  in <var>value</var> has been destroyed,
   return <a>error</a> with <a>error code</a> <a>stale element reference</a>.
 
-  <p>Otherwise return <a>success</a> with data set
-   to <a><code>WindowProxy</code> reference object</a>
-   for <var>value</var>.
+  <p>Otherwise:
+  <ol>
+   <li><p>Let <var>reference</var> be the
+    <a><code>WindowProxy</code> reference object</a> for <var>value</var>.
+
+    <li><p>Return <a>success</a> with data <var>reference</var>.
+  </ol>
 
  <dt>has an <a>own property</a> named "<code>toJSON</code>" that is
   a <a>Function</a>
@@ -6494,31 +6991,27 @@ <h3>Executing Script</h3>
   <a>Function.[[\Call]]</a>(<code>toJSON</code>) with <var>value</var>
   as the this value.
 
- <dt>Otherwise</dt>
+ <dt>Otherwise
  <dd>
   <ol>
-   <li><p>If <var>value</var> is in <var>seen</var>,
-    return <a>error</a> with <a>error code</a> <a>javascript error</a>.
-
-   <li><p>Append <var>value</var> to <var>seen</var>.
-
-   <li><p>Let <var>result</var> be the value of running the
-    <a>clone an object</a> algorithm with arguments <var>value</var> and
-    <var>seen</var>, and the <a>internal JSON clone algorithm</a> as the
+   <li><p>Let <var>result</var> be
+    <a>clone an object</a> with <var>session</var> <var>value</var>
+    and <var>seen</var>, and <a>internal JSON clone</a> as the
     <var>clone algorithm</var>.
 
-   <li><p>Remove the last element of <var>seen</var>.
-
-   <li><p>Return <var>result</var>.
+   <li>Return <a>success</a> with data <var>result</var>.
   </ol>
 </dl>
 
-<p>To <dfn>clone an object</dfn>,
- taking the arguments <var>value</var>,
- <var>seen</var>,
- and <var>clone algorithm</var>:
+<p>To <dfn>clone an object</dfn>, given <var>session</var>, <var>value</var>,
+ <var>seen</var>, and <var>clone algorithm</var>:
 
 <ol>
+ <li><p>If <var>value</var> is in <var>seen</var>,
+  return <a>error</a> with <a>error code</a> <a>javascript error</a>.
+
+ <li><p>Append <var>value</var> to <var>seen</var>.
+
  <li><p>Let <var>result</var> be the value of the first matching statement,
   matching on <var>value</var>:
 
@@ -6533,49 +7026,51 @@ <h3>Executing Script</h3>
    <dd><p>A new <a>Object</a>.
   </dl>
 
- <li><p>For each enumerable <a>own property</a>
+ <li><p>For each enumerable property
   in <var>value</var>, run the following substeps:
 
-  <ol>
-   <li><p>Let <var>name</var> be the name of the property.
+ <ol>
+  <li><p>Let <var>name</var> be the name of the property.
 
-   <li><p>Let <var>source property value</var> be the result of
-    <a>getting a property</a> named <var>name</var> from <var>value</var>.
-    If doing so causes script to be run and that script throws an error,
-    return <a>error</a> with <a>error code</a> <a>javascript error</a>.
+  <li><p>Let <var>source property value</var> be the result of
+   <a>getting a property</a> named <var>name</var> from <var>value</var>.
+   If doing so causes script to be run and that script throws an error,
+   return <a>error</a> with <a>error code</a> <a>javascript error</a>.
 
-   <li><p>Let <var>cloned property result</var> be the result of
-    calling the <var>clone algorithm</var> with arguments
-    <var>source property value</var> and <var>seen</var>.
+  <li><p>Let <var>cloned property result</var> be the result of
+   calling the <var>clone algorithm</var> with <var>session</var>,
+   <var>source property value</var> and <var>seen</var>.
 
-   <li><p>If <var>cloned property result</var> is a <a>success</a>,
-    <a>set a property</a> of <var>result</var> with
-    name <var>name</var> and value equal to <var>cloned property result</var>’s data.
+  <li><p>If <var>cloned property result</var> is a <a>success</a>,
+   <a>set a property</a> of <var>result</var> with
+   name <var>name</var> and value equal to <var>cloned property result</var>&apos;s data.
 
-   <li><p>Otherwise, return <var>cloned property result</var>.
-  </ol>
+  <li><p>Otherwise, return <var>cloned property result</var>.
+ </ol>
+
+ <li><p>Remove the last element of <var>seen</var>.
+
+ <li>Return <a>success</a> with data <var>result</var>.
 </ol>
 
 <p>When required to <dfn>extract the script arguments from a
  request</dfn> with argument <var>parameters</var> the implementation must:
 
 <ol>
- <li><p>Let <var>script</var> be the result of
-  <a>getting a property</a> named <code>script</code>
-  from the <var>parameters</var>.
+ <li><p>Let <var>script</var> be the result of <a>getting a
+  property</a> named "<code>script</code>" from <var>parameters</var>.
 
  <li><p>If <var>script</var> is not a <a>String</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>Let <var>args</var> be the result of
-  <a>getting a property</a> named <code>args</code>
-  from the <var>parameters</var>.
+ <li><p>Let <var>args</var> be the result of <a>getting a property</a>
+  named "<code>args</code>" from <var>parameters</var>.
 
  <li><p>If <var>args</var> is not an <a>Array</a> return <a>error</a>
   with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>Let <var>arguments</var> be the result of calling the
-  <a>JSON deserialize</a> algorithm with arguments <var>args</var>.
+ <li><p>Let <var>arguments</var> be <a>JSON deserialize</a>
+  with <var>session</var> and <var>args</var>.
 
  <li><p>Return <a>success</a> with data <var>script</var>
   and <var>arguments</var>.
@@ -6586,17 +7081,18 @@ <h3>Executing Script</h3>
 
 <p>If at any point during the algorithm a <a>user prompt</a> appears,
  immediately return <a>Completion</a> { [[\Type]]: <code>normal</code>, [[\Value]]: <a><code>null</code></a>,
- [[\Target]]: <code>empty</code> }, but continue to run the other steps of this algorithm in parallel.
+ [[\Target]]: <code>empty</code> }, but continue to run the other steps of this algorithm [=in parallel=].
 
 <ol>
  <li><p>Let <var>window</var> be the <a>associated window</a>
-  of the <a>current browsing context</a>’s <a>active document</a>.
+  of <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>active
+  document</a>.
 
  <li><p>Let <var>environment settings</var> be
-  the <a>environment settings object</a> for <var>window</var>.
+  <var>window</var>&apos;s [=relevant settings object=].
 
  <li>Let <var>global scope</var> be
-  <var>environment settings</var> <a>realm</a>’s
+  <var>environment settings</var> <a>realm</a>&apos;s
   <a>global environment</a>.
 
  <li><p>If <var>body</var> is not parsable as a <a>FunctionBody</a>
@@ -6609,7 +7105,7 @@ <h3>Executing Script</h3>
   then let <var>strict</var> be true,
   otherwise let <var>strict</var> be false.
 
- <li><p><a>Prepare to run a script</a> with <var>environment settings</var>.
+ <li><p><a>Prepare to run script</a> with <var>environment settings</var>.
 
  <li><p><a>Prepare to run a callback</a> with <var>environment settings</var>.
 
@@ -6640,7 +7136,7 @@ <h3>Executing Script</h3>
  <li><p><a>Clean up after running a callback</a>
   with <var>environment settings</var>.
 
- <li><p><a>Clean up after running a script</a>
+ <li><p><a>Clean up after running script</a>
   with <var>environment settings</var>.
 
  <li><p>Return <var>completion</var>.
@@ -6664,17 +7160,32 @@ <h4><dfn>Execute Script</dfn></h4>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>Let <var>body</var> and <var>arguments</var> be the result of
   <a>trying</a> to <a>extract the script arguments from a request</a>
   with argument <var>parameters</var>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
+
+ <li><p>Let <var>timeout</var> be <var>session</var>&apos;s
+ <a>session timeouts</a>&apos; [=timeouts/script timeout=].
+
+ <li><p>Let <var>timer</var> be a new <a>timer</a>.
+
+ <li><p>If <var>timeout</var> is not null:
+
+  <ol>
+   <li><p><a>Start the timer</a> with <var>timer</var>
+   and <var>timeout</var>.
+ </ol>
 
  <li><p>Let <var>promise</var> be <a>a new Promise</a>.
 
@@ -6691,18 +7202,24 @@ <h4><dfn>Execute Script</dfn></h4>
       <a>reject</a> <var>promise</var> with value <var>r</var>.
    </ol>
 
+  <li><p>Wait until <var>promise</var> is resolved,
+  or <var>timer</var>&apos;s [=timer/timeout fired flag=] is set,
+  whichever occurs first.
+
   <li><p>If <var>promise</var> is still pending and
-    the <a>session script timeout</a> is reached,
-    return <a>error</a> with <a>error code</a> <a data-lt="script timeout error">script timeout</a>.
+  <var>timer</var>&apos;s [=timer/timeout fired flag=] is set,
+  return <a>error</a> with <a>error code</a> <a data-lt="script
+  timeout error">script timeout</a>.
 
-  <li><p>Upon fulfillment of <var>promise</var> with value <var>v</var>,
-      let <var>result</var> be a <a>JSON clone</a> of <var>v</var>, and
-      return <a>success</a> with data <var>result</var>.
+  <li><p>If <var>promise</var> is fulfilled with value <var>v</var>,
+  let <var>result</var> be <a>JSON clone</a> with <var>session</var>
+  and <var>v</var>, and return <a>success</a> with
+  data <var>result</var>.
 
-  <li><p>Upon rejection of <var>promise</var> with reason <var>r</var>,
-      let <var>result</var> be a <a>JSON clone</a> of <var>r</var>, and
-      return <a>error</a> with <a>error code</a> <a>javascript error</a>
-      and data <var>result</var>.
+  <li><p>If <var>promise</var> is rejected with reason <var>r</var>,
+  let <var>result</var> be <a>JSON clone</a> with <var>session</var>
+  and <var>r</var>, and return <a>error</a> with <a>error
+  code</a> <a>javascript error</a> and data <var>result</var>.
 </ol>
 </section> <!-- /Execute Script -->
 
@@ -6727,17 +7244,32 @@ <h4><dfn>Execute Async Script</dfn></h4>
 This is a function that may be invoked to signal the completion of the asynchronous operation.
 The first argument provided to the function will be serialized to JSON and returned by <a>Execute Async Script</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
   <li><p>Let <var>body</var> and <var>arguments</var> by the result of <a>trying</a> to
      <a>extract the script arguments from a request</a> with
      argument <var>parameters</var>.
 
-  <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-   return <a>error</a> with <a>error code</a> <a>no such window</a>.
+  <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+   is <a>no longer open</a>, return <a>error</a> with <a>error
+   code</a> <a>no such window</a>.
+
+  <li><p><a>Try</a> to <a>handle any user prompts</a>
+   with <var>session</var>.
+
+  <li><p>Let <var>timeout</var> be <var>session</var>&apos;s
+  <a>session timeouts</a>&apos; [=timeouts/script timeout=].
+
+  <li><p>Let <var>timer</var> be a new <a>timer</a>.
+
+  <li><p>If <var>timeout</var> is not null:
 
-   <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+   <ol>
+    <li><p><a>Start the timer</a> with <var>timer</var>
+    and <var>timeout</var>.
+  </ol>
 
   <li><p>Let <var>promise</var> be <a>a new Promise</a>.
 
@@ -6781,18 +7313,24 @@ <h4><dfn>Execute Async Script</dfn></h4>
       <a>reject</a> <var>promise</var> with value <var>r</var>.
   </ol>
 
-  <li><p>If <var>promise</var> is still pending and
-   <a>session script timeout</a> milliseconds is reached,
-   return <a>error</a> with <a>error code</a> <a data-lt="script timeout error">script timeout</a>.
+   <li><p>Wait until <var>promise</var> is resolved,
+   or <var>timer</var>&apos;s [=timer/timeout fired flag=] is set,
+   whichever occurs first.
+
+   <li><p>If <var>promise</var> is still pending and
+   <var>timer</var>&apos;s [=timer/timeout fired flag=] is set,
+   return <a>error</a> with <a>error code</a> <a data-lt="script
+   timeout error">script timeout</a>.
 
-  <li><p>Upon fulfillment of <var>promise</var> with value <var>v</var>,
-      let <var>result</var> be a <a>JSON clone</a> of <var>v</var>, and
-      return <a>success</a> with data <var>result</var>.
+  <li><p>If <var>promise</var> is fulfilled with value <var>v</var>,
+  let <var>result</var> be <a>JSON clone</a> with <var>session</var>
+  and <var>v</var>, and return <a>success</a> with
+  data <var>result</var>.
 
-  <li><p>Upon rejection of <var>promise</var> with reason <var>r</var>,
-      let <var>result</var> be a <a>JSON clone</a> of <var>r</var>, and
-      return <a>error</a> with <a>error code</a> <a>javascript error</a>
-      and data <var>result</var>.
+  <li><p>If <var>promise</var> is rejected with reason <var>r</var>,
+  let <var>result</var> be <a>JSON clone</a> with <var>session</var>
+  and <var>r</var>, and return <a>error</a> with <a>error
+  code</a> <a>javascript error</a> and data <var>result</var>.
 </ol>
 </section> <!-- /Execute Async Script -->
 </section> <!-- /Executing Script -->
@@ -6806,7 +7344,7 @@ <h2>Cookies</h2>
  as described in [[RFC6265]].
 
 <p>A <a>cookie</a> is described in [[RFC6265]]
- by a name-value pair holding the cookie’s data,
+ by a name-value pair holding the cookie&apos;s data,
  followed by zero or more attribute-value pairs describing its characteristics.
 
 <p>The following <dfn>table for cookie conversion</dfn>
@@ -6868,8 +7406,8 @@ <h2>Cookies</h2>
   <td>"<code>Domain</code>"
   <td>✓
   <td>The domain the cookie is visible to.
-   Defaults to the <a>current browsing context</a>’s
-   <a>active document</a>’s <a>URL</a> <a>domain</a>
+   Defaults to <var>session</var>&apos;s <a>current browsing context</a>&apos;s
+   <a>active document</a>&apos;s <a>URL</a> <a>domain</a>
    if omitted when <a>adding a cookie</a>.
  </tr>
 
@@ -6918,18 +7456,18 @@ <h2>Cookies</h2>
 </table>
 
 <p>A <dfn>serialized cookie</dfn> is a JSON <a>Object</a>
- where a <a>cookie</a>’s [[RFC6265]] fields
+ where a <a>cookie</a>&apos;s [[RFC6265]] fields
  listed in the <a>table for cookie conversion</a>
  are mapped using the <i>JSON Key</i>
- and the associated field’s value from the <a>cookie store</a>.
+ and the associated field&apos;s value from the <a>cookie store</a>.
  The optional fields may be omitted.
 
 <p>To get <dfn data-lt="associated cookies">all associated cookies</dfn> to a <a>document</a>,
  the user agent must return the enumerated set of <a>cookies</a>
  that meet the requirements set out in the first step of the algorithm in [[RFC6265]] to
- <a>compute <code>cookie-string</code></a> for an ‘HTTP API’, from
+ <a>compute <code>cookie-string</code></a> for an ‘HTTP API&apos;, from
  the <a>cookie store</a> of the
- given <a>document</a>’s <a>address</a>. The returned cookies must
+ given <a>document</a>&apos;s <a>address</a>. The returned cookies must
  include <a data-lt="cookie HTTP only">HttpOnly cookies</a>.
 
 <p>When the <a>remote end</a> is instructed
@@ -6945,8 +7483,8 @@ <h2>Cookies</h2>
 
 <ol>
  <li><p>For each <a>cookie</a> among <a>all associated cookies</a> of
-  the <a>current browsing context</a>’s <a>active document</a>,
-  run the substeps of the first matching condition:
+  <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>active
+  document</a>, run the substeps of the first matching condition:
 
   <dl class=switch>
    <dt><var>name</var> is <a>undefined</a>
@@ -6973,18 +7511,22 @@ <h3><dfn>Get All Cookies</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>Let <var>cookies</var> be a new JSON <a>List</a>.
+ <li><p>Let <var>cookies</var> be a new <a>List</a>.
 
  <li><p>For each <var>cookie</var> in <a>all associated cookies</a> of
-  the <a>current browsing context</a>’s <a>active document</a>:
+  <var>session</var>&apos;s <a>current browsing context</a>&apos;s <a>active
+  document</a>:
 
   <ol>
    <li><p>Let <var>serialized cookie</var> be the result
@@ -7011,19 +7553,22 @@ <h3><dfn>Get Named Cookie</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>If the <a>url variable</a> <var>name</var>
-  is equal to a <a>cookie</a>’s <a>cookie name</a>
-  amongst <a>all associated cookies</a>
-  of the <a>current browsing context</a>’s <a>active document</a>,
-  return <a>success</a> with the <a>serialized cookie</a> as data.
+ <li><p>If the <var>URL variables</var>["<code>name</code>" is equal to
+  a <a>cookie</a>&apos;s <a>cookie name</a> amongst <a>all associated
+  cookies</a> of <var>session</var>&apos;s <a>current browsing
+  context</a>&apos;s <a>active document</a>, return <a>success</a> with
+  the <a>serialized cookie</a> as data.
 
   <p>Otherwise, return <a>error</a>
    with <a>error code</a> <a>no such cookie</a>.
@@ -7044,37 +7589,42 @@ <h3><dfn data-lt="adding a cookie">Add Cookie</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>Let <var>data</var> be the result of <a>getting a property</a>
-  named <code>cookie</code> from the <var>parameters</var> argument.
+  named "<code>cookie</code>" from <var>parameters</var>.
 
  <li><p>If <var>data</var> is not a JSON <a>Object</a>
   with all the required (non-optional) JSON keys
   listed in the <a>table for cookie conversion</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p>If the <a>current browsing context</a>’s <a>document element</a>
-  is a <a>cookie-averse <code>Document</code> object</a>,
-  return <a>error</a> with <a>error code</a> <a>invalid cookie domain</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing
+  context</a>&apos;s <a>document element</a> is
+  a <a>cookie-averse <code>Document</code> object</a>,
+  return <a>error</a> with <a>error code</a> <a>invalid cookie
+  domain</a>.
 
  <li><p>If <a>cookie name</a> or <a>cookie value</a> is <a><code>null</code></a>,
-  <a>cookie domain</a> is not equal to
-  the <a>current browsing context</a>’s <a>active document</a>’s <a>domain</a>,
+  <a>cookie domain</a> is not equal to <var>session</var>&apos;s <a>current
+  browsing context</a>&apos;s <a>active document</a>&apos;s <a>domain</a>,
   <a>cookie secure only</a> or <a>cookie HTTP only</a> are not boolean types,
-  or <a>cookie expiry time</a> is not an integer type,
-  or it less than 0 or greater than the <a>maximum safe integer</a>,
-  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+  or <a>cookie expiry time</a> is not an integer type, or it less than 0 or greater than
+  the <a>maximum safe integer</a>, return <a>error</a> with <a>error
+  code</a> <a>invalid argument</a>.
 
  <li><p><a>Create a cookie</a> in
   the <a>cookie store</a> associated with
-  the <a>active document</a>’s <a>address</a>
+  the <a>active document</a>&apos;s <a>address</a>
   using <a>cookie name</a> <var>name</var>,
   <a>cookie value</a> <var>value</var>,
   and an attribute-value list of the following cookie concepts
@@ -7087,8 +7637,8 @@ <h3><dfn data-lt="adding a cookie">Add Cookie</dfn></h3>
 
    <dt><a>Cookie domain</a>
    <dd><p>The value if the entry exists,
-    otherwise the <a>current browsing context</a>’s
-    <a>active document</a>’s <a>URL</a> <a>domain</a>.
+    otherwise <var>session</var>&apos;s <a>current browsing context</a>&apos;s
+    <a>active document</a>&apos;s <a>URL</a> <a>domain</a>.
 
    <dt><a>Cookie secure only</a>
    <dd><p>The value if the entry exists, otherwise false.
@@ -7127,17 +7677,19 @@ <h3><dfn>Delete Cookie</dfn></h3>
   </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p><a>Delete cookies</a> using
-  the <a>url variable</a> <var>name</var> parameter
-  as the filter argument.
+ <li><p><a>Delete cookies</a> using the <var>URL
+  variables</var>["<code>name</code>"] as the filter argument.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -7157,13 +7709,16 @@ <h3><dfn>Delete All Cookies</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>, and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
  <li><p><a>Delete cookies</a>, giving no filtering argument.
 
@@ -7201,7 +7756,7 @@ <h2><dfn>Actions</dfn></h2>
   Then both fingers release from the touchscreen.
 
  <p>When the <a>remote end</a> receives this,
-  it will look at each <a>input source</a>’s action lists.
+  it will look at each <a>input source</a>&apos;s action lists.
   It will dispatch the first action of each source together,
   then the second actions together, and lastly, the final actions together.
 
@@ -7211,9 +7766,9 @@ <h2><dfn>Actions</dfn></h2>
  <p><img src=graphics/note1actions.svg alt="">
 
  <p>There is no limit to the number of <a>input sources</a>,
-  and there is no restriction regarding the length of each input’s action list.
+  and there is no restriction regarding the length of each input&apos;s action list.
   This means, there is no requirement that all action lists have to be the same length.
-  It is possible for one <a>input source</a>’s action list
+  It is possible for one <a>input source</a>&apos;s action list
   may have more actions than another.
 
  <p>In this case, the action list for the first finger contains 2 actions
@@ -7257,6 +7812,32 @@ <h2><dfn>Actions</dfn></h2>
   while source 2 will do nothing.
 </aside> <!-- /example -->
 
+<section>
+<h3>Actions Options</h3>
+
+<p>Configuration of actions dispatch is controlled by a
+<dfn>actions options</dfn> object. This is a [=struct=] that has a
+fields named <dfn>is element origin</dfn>, which is a set of steps
+that validate if a protocol object represents an element origin,
+and <dfn>get element origin</dfn>, which is a set of steps
+used to deserialize an element.
+
+<p>To <dfn>get a WebElement origin</dfn>
+given <var>session</var>, <var>origin</var> and <var>browsing
+context</var>:,
+<ol class="algorithm">
+  <li><p>Assert: <var>browsing context</var> is the <a>current
+  browsing context</a>.
+
+  <li><p>Let <var>element</var> be equal to the result
+  of <a>trying</a> to <a>get a known element</a> with
+  <var>session</var> and <var>origin</var>.
+
+  <li><p>Return <a>success</a> with data <var>element</var>.
+</ol>
+
+</section> <!-- /actions options -->
+
 <section>
 <h3>Input sources</h3>
 
@@ -7427,7 +8008,7 @@ <h4>Pointer input source</h4>
  <tr>
   <td>y
   <td>An unsigned integer representing the pointer y location in
-  viewport coordindates.
+  viewport coordinates.
   <td>0
  </tr>
 </table>
@@ -7458,7 +8039,7 @@ <h4>Pointer input source</h4>
    move to, either in its active (pressed) or inactive state.</td>
  </tr>
  <tr>
-  <td><dfn>pointerCancel</dfn></td>
+  <td><dfn class="lint-ignore">pointerCancel</dfn></td>
   <td>Used to cancel a pointer action.</td>
  </tr>
 </table>
@@ -7466,7 +8047,7 @@ <h4>Pointer input source</h4>
 <p>To <dfn>create a pointer input source</dfn> object given <var>input
  state</var>, and <var>subtype</var>, return a new <a>pointer input
  source</a> with subtype set to <var>subtype</var>, pointerId set
- to <a>get a pointer id</a> with <var>input state</a>
+ to <a>get a pointer id</a> with <var>input state</var>
  and <var>subtype</var>, and the other items set to their default
  values.
 
@@ -7529,14 +8110,14 @@ <h3>Input state</h3>
  context</a>.
 
  <li><p>Let <var>input state map</var>
- be <var>session</var>'s <a>browsing context input state map</a>.
+ be <var>session</var>&apos;s <a>browsing context input state map</a>.
 
  <li><p>If <var>input state map</var> does not
  [=map/exist|contain=] <var>browsing context</var>, set <var>input
  state map</var>[<var>browsing context</var>] to <a>create an input
  state</a>.
 
- <li><p><var>Return <var>input state map</var>[<var>browsing
+ <li><p>Return <var>input state map</var>[<var>browsing
  context</var>].
 </ol>
 
@@ -7548,7 +8129,7 @@ <h3>Input state</h3>
  context</a>.
 
  <li><p>Let <var>input state map</var>
- be <var>session</var>'s <a>browsing context input state map</a>.
+ be <var>session</var>&apos;s <a>browsing context input state map</a>.
 
  <li><p>If <var>input state map</var>[<var>browsing context</var>]
  [=map/exists=], then [=remove=] <var>input state map</var>[<var>browsing
@@ -7570,22 +8151,21 @@ <h3>Input state</h3>
 
 <ol class="algorithm">
   <li><p>Let <var>input state map</var> be <var>input
-  state</var>'s <a>input state map</a>.
+  state</var>&apos;s <a>input state map</a>.
 
   <li>Set <var>input state map</var>[<var>input id</var>]
   to <var>source</var>.
 </ol>
-</div>
 
 <p>To <dfn>remove an input source</dfn> given <var>input state</var>,
 and <var>input id</var>:
 <ol class="algorithm">
   <li><p>Assert: None of the items in <var>input
-  state</var>'s <a>input cancel list</a> has id equal
+  state</var>&apos;s <a>input cancel list</a> has id equal
   to <var>input id</var>.
 
   <li><p>Let <var>input state map</var> be <var>input
-  state</var>'s <a>input state map</a>.
+  state</var>&apos;s <a>input state map</a>.
 
   <li>Remove <var>input state map</var>[<var>input id</var>].
 </ol>
@@ -7595,7 +8175,7 @@ <h3>Input state</h3>
 
 <ol class="algorithm">
   <li><p>Let <var>input state map</var> be <var>input
-  state</var>'s <a>input state map</a>.
+  state</var>&apos;s <a>input state map</a>.
 
   <li><p>If <var>input state map</var>[<var>input id</var>] exists,
   return <var>input state map</var>[<var>input id</var>].
@@ -7611,9 +8191,9 @@ <h3>Input state</h3>
   <li><p>Let <var>source</var> be <a>get an input source</a>
   with <var>input state</var> and <var>input id</var>.
 
-  <li><p>If <var>source</var> is not undefined and <var>source</var>'s
+  <li><p>If <var>source</var> is not undefined and <var>source</var>&apos;s
   type is not equal to <var>type</var>, or <var>source</var> is
-  a <a>pointer input source</a>return <a>error</a> with <a>error
+  a <a>pointer input source</a>, return <a>error</a> with <a>error
   code</a> <a>invalid argument</a>.
 
   <li><p>If <var>source</var> is undefined, set <var>source</var> to
@@ -7630,7 +8210,7 @@ <h3>Input state</h3>
 
 <ol class="algorithm">
  <li><p>Let <var>input state map</var> be <var>input
-  state</var>'s <a>input state map</a>.
+  state</var>&apos;s <a>input state map</a>.
 
  <li><p>Let <var>sources</var> be the result of [=map/getting the
  values=] with <var>input state map</var>.
@@ -7646,20 +8226,20 @@ <h3>Input state</h3>
   <li><p>If <var>source</var> is not a <a>key input source</a>,
    continue to the first step of this loop.
 
-  <li><p>Set <var>key state</var>'s <code>pressed</code> item to the
-  union of its current value and <var>source</var>'s pressed item.
+  <li><p>Set <var>key state</var>&apos;s <code>pressed</code> item to the
+  union of its current value and <var>source</var>&apos;s pressed item.
 
-  <li><p>If <var>source</var>'s <code>alt</code> item is true,
-  set <var>key state</var>'s <code>altKey</code> item to true.
+  <li><p>If <var>source</var>&apos;s <code>alt</code> item is true,
+  set <var>key state</var>&apos;s <code>altKey</code> item to true.
 
-  <li><p>If <var>source</var>'s <code>ctrl</code> item is true,
-  set <var>key state</var>'s <code>ctrlKey</code> item to true.
+  <li><p>If <var>source</var>&apos;s <code>ctrl</code> item is true,
+  set <var>key state</var>&apos;s <code>ctrlKey</code> item to true.
 
-  <li><p>If <var>source</var>'s <code>meta</code> item is true,
-  set <var>key state</var>'s <code>metaKey</code> item to true.
+  <li><p>If <var>source</var>&apos;s <code>meta</code> item is true,
+  set <var>key state</var>&apos;s <code>metaKey</code> item to true.
 
-  <li><p>If <var>source</var>'s <code>shift</code> item is true,
-  set <var>key state</var>'s <code>shiftKey</code> item to true.
+  <li><p>If <var>source</var>&apos;s <code>shift</code> item is true,
+  set <var>key state</var>&apos;s <code>shiftKey</code> item to true.
  </ol>
 
  <li><p>Return <var>key state</var>.
@@ -7670,17 +8250,17 @@ <h3>Input state</h3>
 
 <ol class=algorithm>
  <li>Let <var>minimum id</var> be 0 if <var>subtype</var> is
- "<code>mouse</code>', or 2 otherwise.
+ "<code>mouse</code>", or 2 otherwise.
 
  <li>Let <var>pointer ids</var> be an empty set.
 
  <li><p>Let <var>sources</var> be the result of [=map/getting the
- values=] with <var>input state</var>'s <a>input state map</a>.
+ values=] with <var>input state</var>&apos;s <a>input state map</a>.
 
  <li><p>For each <var>source</var> in <var>sources</var>.:
   <ol>
    <li><p>If <var>source</var> is a <a>pointer input source</a>,
-    append <var>source</var>'s pointerId to <var>pointer ids</var>.
+    append <var>source</var>&apos;s pointerId to <var>pointer ids</var>.
   </ol>
 
  <li><p>Return the smallest integer that is greater than or equal
@@ -7697,7 +8277,7 @@ <h3>Ticks</h3>
  which actions can be performed. During a <a>tick</a>, each <a>input source</a> has
  an assigned action — possibly a noop <a>pause</a> action — which may
  result in changes to the user agent internal state and eventually
- cause DOM events to be <a>fired</a> at the page. The next <a>tick</a> begins
+ cause DOM events to be [=fire an event|fired=] at the page. The next <a>tick</a> begins
  after the user agent has had a chance to process all DOM events
  generated in the current <a>tick</a>.
 
@@ -7708,7 +8288,7 @@ <h3>Ticks</h3>
  loop</a>.
 
 <p>At the lowest level, the behavior of actions is intended to mimic
- the <a>remote end</a>’s behavior with an actual input device as
+ the <a>remote end</a>&apos;s behavior with an actual input device as
  closely as possible, and the implementation strategy may involve
  e.g. injecting synthesized events into a browser event
  loop. Therefore the steps to dispatch an action will inevitably end
@@ -7741,10 +8321,10 @@ <h3>Ticks</h3>
 <p>
 The most robust way to dispatch these events is by creating them in
 the browser implementation itself.  Sending operating system specific
-input messages to the browser’s window has the disadvantage that the
+input messages to the browser&apos;s window has the disadvantage that the
 browser being automated may not be properly isolated from a user
 accidentally modifying an <a>input source</a>.  Use of an operating
-system level accessibility API has the disadvantage that the browser’s
+system level accessibility API has the disadvantage that the browser&apos;s
 window must be focused, and as a result, multiple WebDriver instances
 cannot run in parallel.
 
@@ -7768,17 +8348,74 @@ <h3>Processing actions</h3>
  input JSON, such that the actions to be performed in a single <a>tick</a>
  are grouped together.
 
-<p>To <dfn>extract an action sequence</dfn> with
- <var>input state</var>, and <var>parameters</var>:
+
+<p>To <dfn>get coordinates relative to an origin</dfn>
+given <var>source</var>, <var>x offset</var>, <var>y offset</var>,
+<var>origin</var>, <var>browsing context</var>, and <var>actions
+options</var>:
 
 <ol class="algorithm">
- <li><p>Let <var>actions</var> be the result
-  of <a>getting a property</a> from <var>parameters</var>
-  named <code>actions</code>.
+ <li><p>Run the substeps of the first matching value
+  of <var>origin</var>
+  <dl>
+   <dt>"<code>viewport</code>"
+   <dd>
+    <ol>
+     <li><p>Let <var>x</var> equal <var>x offset</var> and
+     <var>y</var> equal <var>y offset</var>.
+    </ol>
+   </dd>
 
- <li><p>If <var>actions</var> is <a>undefined</a>
-  or is not an <a>Array</a>,
-  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+   <dt>"<code>pointer</code>"
+   <dd>
+    <ol>
+     <li><p>Let <var>start x</var> be equal to the <code>x</code>
+     property of <var>source</var>.
+
+     <li><p>Let <var>start y</var> be equal to the <code>y</code>
+     property of <var>source</var>.
+
+     <li><p>Let <var>x</var> equal <var>start x</var> +
+     <var>x offset</var> and <var>y</var> equal
+     <var>start y</var> + <var>y  offset</var>.
+    </ol>
+   </dd>
+
+   <dt>Otherwise</dt>
+   <dd>
+    <ol>
+     <li><p>Let <var>element</var> be the result of <a>trying</a> to
+     run <var>actions options</var>&apos; <a>get element origin</a>
+     steps with <var>origin</var> and <var>browsing context</var>.
+
+     <li><p>If <var>element</var> is null, return <a>error</a> with <a>error
+     code</a> <a>no such element</a>.
+
+     <li><p>Let <var>x element</var> and <var>y element</var> be the
+     result of calculating the <a>in-view center point</a>
+     of <var>element</var>.
+
+     <li><p>Let <var>x</var> equal <var>x element</var> +
+     <var>x offset</var>, and <var>y</var> equal
+     <var>y element</var> + <var>y offset</var>.
+    </ol>
+   </dd>
+  </dl>
+
+ <li><p>Return (<var>x</var>, <var>y</var>)
+</ol>
+
+<p>To <dfn>extract an action sequence</dfn> given
+ <var>input state</var>, <var>parameters</var>, and <var>actions
+ options</var>:
+
+<ol class="algorithm">
+ <li><p>Let <var>actions</var> be the result of <a>getting a
+  property</a> named "<code>actions</code>" from <var>parameters</var>.
+
+ <li><p>If <var>actions</var> is <a>undefined</a> or is not
+  an <a>Array</a>, return <a>error</a> with <a>error
+  code</a> <a>invalid argument</a>.
 
  <!-- TODO: not sure if reusing the ES definition of List works here-->
  <li><p>Let <var>actions by tick</var> be an empty <a>List</a>.</li>
@@ -7787,9 +8424,10 @@ <h3>Processing actions</h3>
   corresponding to an indexed property in <var>actions</var>:
 
   <ol>
-   <li><p>Let <var>source actions</var> be the result
-    of <a>trying</a> to <a>process an input source action sequence</a>
-    given <var>input state</var> and <var>action sequence</var>.
+   <li><p>Let <var>source actions</var> be the result of <a>trying</a>
+    to <a>process an input source action sequence</a> given <var>input
+    state</var>, <var>action sequence</var>, and <var>actions
+    options</var>.
 
    <li><p>For each <var>action</var> in <var>source actions</var>:
 
@@ -7812,9 +8450,9 @@ <h3>Processing actions</h3>
 </ol>
 
 <p>When required to <dfn>process an input source action
- sequence</dfn>, with argument <var>input state</var>
- and <var>action sequence</var>, a <a>remote end</a> must run the
- following steps:
+ sequence</dfn>, given <var>input state</var>, <var>action
+ sequence</var>, and <var>actions options</var>, a <a>remote end</a>
+ must:
 
 <ol class="algorithm">
  <li><p>Let <var>type</var> be the result of <a>getting a property</a>
@@ -7849,11 +8487,11 @@ <h3>Processing actions</h3>
 
  <li><p>If <var>parameters</var> is not <a>undefined</a>,
   then if its <code>pointerType</code> property is not equal to
-  <var>source</var>’s subtype property, return an <a>error</a>
+  <var>source</var>&apos;s subtype property, return an <a>error</a>
   with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>action items</var> be the result of <a>getting a
-  property</a> named <code>actions</code> from
+  property</a> named "<code>actions</code>" from
   <var>action sequence</var>.
 
  <li><p>If <var>action items</var> is not an <a>Array</a>,
@@ -7881,12 +8519,13 @@ <h3>Processing actions</h3>
    <li><p>Otherwise, if <var>type</var> is "<code>pointer</code>"
     let <var>action</var> be the result of <a>trying</a> to <a>process
     a pointer action</a> with parameters <var>id</var>,
-    <var>parameters</var>, and <var>action item</var>.
+    <var>parameters</var>, <var>action item</var>, and <var>actions
+    options</var>.
 
    <li><p>Otherwise, if <var>type</var> is "<code>wheel</code>"
     let <var>action</var> be the result of <a>trying</a> to <a>process
     a wheel action</a> with parameters <var>id</var>, and
-    <var>action item</var>.
+    <var>action item</var>, and <var>actions options</var>.
 
    <li><p>Append <var>action</var> to <var>actions</var>.
   </ol>
@@ -7914,7 +8553,7 @@ <h3>Processing actions</h3>
 
 <li><p>
 Let <var>pointer type</var> be the result
-of <a>getting a property</a> named <code>pointerType</code>
+of <a>getting a property</a> named "<code>pointerType</code>"
 from <var>parameters data</var>.
 
 <li><p>
@@ -8000,10 +8639,8 @@ <h3>Processing actions</h3>
 <var>action item</var> and <var>action</var>,
 and return <var>result</var>.
 
-<li><p>
-Let <var>key</var> be the result
-of <a>getting a property</a> named <code>value</code>
-from <var>action item</var>.
+<li><p> Let <var>key</var> be the result of <a>getting a property</a>
+named "<code>value</code>" from <var>action item</var>.
 
 <li><p>
 If <var>key</var> is not a <a>String</a> containing a single <a>unicode code point</a>
@@ -8018,7 +8655,8 @@ <h3>Processing actions</h3>
 </ol>
 
 <p>To <dfn>process a pointer action</dfn> given <var>id</var>,
-<var>parameters</var>, and <var>action item</var>:
+<var>parameters</var>, <var>action item</var>, and <var>action
+options</var>:
 
 <ol class="algorithm">
 <li><p>
@@ -8045,8 +8683,8 @@ <h3>Processing actions</h3>
 If <var>subtype</var> is "<code>pause</code>",
 let <var>result</var> be the result of <a>trying</a> to
 <a>process a pause action</a> with arguments
-<var>action item</var> and <var>action</var>,
-and return <var>result</var>.
+<var>action item</var>, <var>action</var>, and <var>actions
+options</var>, and return <var>result</var>.
 
 <li><p>
 Set the <code>pointerType</code> property of <var>action</var>
@@ -8061,8 +8699,9 @@ <h3>Processing actions</h3>
 <li><p>
 If <var>subtype</var> is "<code>pointerMove</code>"
 <a>process a pointer move action</a> with arguments
-<var>action item</var> and <var>action</var>.
-If doing so results in an <a>error</a>, return that <a>error</a>.
+<var>action item</var>, <var>action</var>, and <var>actions
+options</var>.  If doing so results in an <a>error</a>, return
+that <a>error</a>.
 
 <li><p>
 If <var>subtype</var> is "<code>pointerCancel</code>"
@@ -8074,7 +8713,8 @@ <h3>Processing actions</h3>
 </ol>
 
 <p>To <dfn>process a wheel action</dfn> given
-<var>id</var>, and <var>action item</var>:</p>
+<var>id</var>, <var>action item</var>, and <var>actions
+options</var>:</p>
 
 <ol class="algorithm">
 <li><p>
@@ -8103,7 +8743,7 @@ <h3>Processing actions</h3>
 
 <li><p>
 Let <var>duration</var> be the result of <a>getting a property</a>
-named <code>duration</code> from <var>action item</var>.
+named "<code>duration</code>" from <var>action item</var>.
 
 <li><p>
 If <var>duration</var> is not <a>undefined</a> and <var>duration</var>
@@ -8123,9 +8763,9 @@ <h3>Processing actions</h3>
 <var>origin</var> equal "<code>viewport</code>".
 
 <li><p>
-If <var>origin</var> is not equal to "<code>viewport</code>"
-or "<code>pointer</code>" and <var>origin</var> is not an <a>Object</a>
-that <a>represents a web element</a>, return <a>error</a> with
+If <var>origin</var> is not equal to "<code>viewport</code>",
+or <var>actions options</var>&apos; <a>is element origin</a> steps given
+<var>origin</var> return false, return <a>error</a> with
 <a>error code</a> <a>invalid argument</a>.
 
 <li><p>
@@ -8321,7 +8961,7 @@ <h3>Processing actions</h3>
 </ol>
 
 <p>To <dfn>process a pointer move action</dfn> given <var>action
-item</var>, and <var>action</var>:</p>
+item</var>, <var>action</var>, and <var>actions options</var>:</p>
 
 <ol class="algorithm">
  <li><p>Let <var>duration</var> be the result
@@ -8343,9 +8983,9 @@ <h3>Processing actions</h3>
   <var>origin</var> equal "<code>viewport</code>".
 
  <li><p>If <var>origin</var> is not equal to "<code>viewport</code>"
-  or "<code>pointer</code>" and <var>origin</var> is not an <a>Object</a>
-  that <a>represents a web element</a>, return <a>error</a> with
-  <a>error code</a> <a>invalid argument</a>.
+  or "<code>pointer</code>", and <var>actions options</var> <a>is
+  element origin</a> steps given <var>origin</var> return false,
+  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Set the <code>origin</code> property of <var>action</var>
   to <var>origin</var>.
@@ -8491,22 +9131,22 @@ <h3>Dispatching actions</h3>
  appropriate point in the sequence.
 
 <p>To <dfn>dispatch actions</dfn> given <var>input
-state</var>, <var>actions by tick</var>, and <var>browsing
-context</var>:
+state</var>, <var>actions by tick</var>, <var>browsing
+context</var>, and <var>actions options</var>:
 
 <ol class=algorithm>
  <li><p>Let <var>token</var> be a new unique identifier.
 
- <li><p>Enqueue <var>token</var> in <var>session</var>'s <a>actions
+ <li><p>Enqueue <var>token</var> in <var>input state</var>&apos;s <a>actions
  queue</a>.
 
  <li><p>Wait for <var>token</var> to be the first item
- in <var>input state</var>'s <a>actions queue</a>.
+ in <var>input state</var>&apos;s <a>actions queue</a>.
 
  <aside class=note>
    <p>This ensures that only one set of actions can be run at a time,
    and therefore different actions commands using the same underlying
-   state don't race. In a session that is only a HTTP session only one
+   state don&apos;t race. In a session that is only a HTTP session only one
    command can run at a time, so this will never block. But other
    session types can allow running multiple commands in parallel, in
    which case this is necessary to ensure sequential access.
@@ -8514,17 +9154,17 @@ <h3>Dispatching actions</h3>
 
  <li><p>Let <var>actions result</var> be the result of <a>dispatch
  actions inner</a> with <var>input state</var>, <var>actions by
- tick</var>, and <var>browsing context</var>
+ tick</var>, <var>browsing context</var>, and <var>actions options</var>.
 
- <li><p>Dequeue <var>input state</var>'s <a>actions queue</a>.
+ <li><p>Dequeue <var>input state</var>&apos;s <a>actions queue</a>.
      <p>Assert: this returns <var>token</var>
 
  <li><p>Return <var>actions result</var>.
 </ol>
 
 <p>To <dfn>dispatch actions inner</dfn> given <var>input
-state</var>, <var>actions by tick</var>, and <var>browsing
-context</var>:
+state</var>, <var>actions by tick</var>, <var>browsing
+context</var>, and <var>actions options</var>:
 
 <ol class=algorithm>
  <li><p>For each item <var>tick actions</var> in
@@ -8534,10 +9174,9 @@ <h3>Dispatching actions</h3>
    <li><p>Let <var>tick duration</var> be the result of <a>computing
     the tick duration</a> with argument <var>tick actions</var>.
 
-   <li><p><a>Dispatch tick actions</a> with
-   <var>tick actions</var>, <var>tick duration</var>,
-   and <var>browsing context</var>.  If this results in
-   an <a>error</a> return that error.
+   <li><p><a>Try</a> to <a>dispatch tick actions</a> with
+   <var>input state</var>, <var>tick actions</var>, <var>tick duration</var>,
+   <var>browsing context</var>, and <var>actions options</var>.
 
    <li><p>Wait until the following conditions are all met:
 
@@ -8588,28 +9227,28 @@ <h3>Dispatching actions</h3>
 
 <p>To <dfn>dispatch tick actions</dfn> given <var>input
  state</var>, <var>tick actions</var>, <var>tick duration</var>,
- and <var>browsing context</var>:
+ <var>browsing context</var>, and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>For each <var>action object</var> in <var>tick actions</var>:
 
   <ol>
    <li><p>Let <var>input id</var> be equal to the value
-    of <var>action object</var>’s id property.
+    of <var>action object</var>&apos;s id property.
 
    <li><p>Let <var>source type</var> be equal to the value
-    of <var>action object</var>’s type property.
+    of <var>action object</var>&apos;s type property.
 
    <li><p>Let <var>source</var> be the result of <a>get an input
     source</a> given <var>input state</var> and <var>input id</var>.
 
    <li><p>Assert: <a>source</a> is not undefined.
 
-   <li><p>Let <var>global key state</a> be the result of <a>get the
+   <li><p>Let <var>global key state</var> be the result of <a>get the
    global key state</a> with <var>input state</var>.
 
    <li><p>Let <var>subtype</var> be <var>action
-   object</var>’s subtype.
+   object</var>&apos;s subtype.
 
    <li><p>Let <var>algorithm</var> be the value of the column
     <i>dispatch action algorithm</i> from the following table where the
@@ -8633,18 +9272,18 @@ <h3>Dispatching actions</h3>
 
    <li><a>Try</a> to run <var>algorithm</var> with arguments
     <var>action object</var>, <var>source</var>, <var>global key
-    state</var>, <var>tick duration</var>, and <var>browsing
-    context</var>.
+    state</var>, <var>tick duration</var>, <var>browsing
+    context</var>, and <var>actions options</var>.
 
    <li><p>If <var>subtype</var> is "<code>keyDown</code>", append
     a copy of <var>action object</var> with the <var>subtype</var>
     property changed to "<code>keyUp</code>" to <var>input
-    state</var>’s <a>input cancel list</a>.
+    state</var>&apos;s <a>input cancel list</a>.
 
    <li><p>If <var>subtype</var> is "<code>pointerDown</code>", append
     a copy of <var>action object</var> with the <var>subtype</var>
     property changed to "<code>pointerUp</code>" to <var>input
-    state</var>’s <a>input cancel list</a>.
+    state</var>&apos;s <a>input cancel list</a>.
 
   </ol>
 
@@ -8652,7 +9291,8 @@ <h3>Dispatching actions</h3>
 </ol>
 
 <p>To <dfn>dispatch a list of actions</dfn> given <var>input
-state</var>, <var>actions</var> and <var>browsing context<var>:
+state</var>, <var>actions</var>, <var>browsing context</var>,
+and <var>actions options</var>:
 
 <aside class=note>
  <p>This is an entry point for other commands that are written in terms
@@ -8667,8 +9307,8 @@ <h3>Dispatching actions</h3>
  actions</var>».
 
  <li><p>Return the result of <a>dispatch actions</a> with <var>input
- state</var>, <var>actions by tick</var>, and <a>current browsing
- context</a>.
+ state</var>, <var>actions by tick</var>, <var>browsing context</var>,
+ and <var>actions options</var>.
 </ol>
 
 <section>
@@ -8676,8 +9316,8 @@ <h4>General actions</h4>
 
 <p>To <dfn>dispatch a pause action</dfn> given <var>action
 object</var>, <var>source</var>, <var>global key
-state</var>, <var>tick duration</var>, and <var>browsing
-context</var>:
+state</var>, <var>tick duration</var>,
+<var>browsing context</var>, and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
@@ -8690,12 +9330,12 @@ <h4>Keyboard actions</h4>
 
 <p>The <dfn>normalized key value</dfn> for a raw key <var>key</var>
  is, if <var>key</var> appears in the table below, the string value in
- the second column on the row containing <var>key</var>’s <a>unicode
+ the second column on the row containing <var>key</var>&apos;s <a>unicode
  code point</a> in the first column, otherwise it is <var>key</var>.
 
 <table class=simple>
  <tr>
-  <th><var>key</var>’s codepoint
+  <th><var>key</var>&apos;s codepoint
   <th>Normalized key value
  </tr>
  <tr><td><code>\uE000</code></td><td><code>"Unidentified"</code></td></tr>
@@ -8845,8 +9485,9 @@ <h4>Keyboard actions</h4>
  <tr><td><code>"\uE009"</code></td><td><code></code></td><td><code>"ControlLeft"</code></td></tr>
  <tr><td><code>"\uE051"</code></td><td><code></code></td><td><code>"ControlRight"</code></td></tr>
  <tr><td><code>"\uE006"</code></td><td><code></code></td><td><code>"Enter"</code></td></tr>
- <tr><td><code>"\uE03D"</code></td><td><code></code></td><td><code>"OSLeft"</code></td></tr>
- <tr><td><code>"\uE053"</code></td><td><code></code></td><td><code>"OSRight"</code></td></tr>
+ <tr><td><code>"\uE00B"</code></td><td><code></code></td><td><code>"Pause"</code></td></tr>
+ <tr><td><code>"\uE03D"</code></td><td><code></code></td><td><code>"MetaLeft"</code></td></tr>
+ <tr><td><code>"\uE053"</code></td><td><code></code></td><td><code>"MetaRight"</code></td></tr>
  <tr><td><code>"\uE008"</code></td><td><code></code></td><td><code>"ShiftLeft"</code></td></tr>
  <tr><td><code>"\uE050"</code></td><td><code></code></td><td><code>"ShiftRight"</code></td></tr>
  <tr><td><code>" "</code></td><td><code>"\uE00D"</code></td><td><code>"Space"</code></td></tr>
@@ -8875,6 +9516,7 @@ <h4>Keyboard actions</h4>
  <tr><td><code>"\uE03A"</code></td><td><code></code></td><td><code>"F10"</code></td></tr>
  <tr><td><code>"\uE03B"</code></td><td><code></code></td><td><code>"F11"</code></td></tr>
  <tr><td><code>"\uE03C"</code></td><td><code></code></td><td><code>"F12"</code></td></tr>
+ <tr><td><code>"\uE019"</code></td><td><code></code></td><td><code>"NumpadEqual"</code></td></tr>
  <tr><td><code>"\uE01A"</code></td><td><code>"\uE05C"</code></td><td><code>"Numpad0"</code></td></tr>
  <tr><td><code>"\uE01B"</code></td><td><code>"\uE056"</code></td><td><code>"Numpad1"</code></td></tr>
  <tr><td><code>"\uE01C"</code></td><td><code>"\uE05B"</code></td><td><code>"Numpad2"</code></td></tr>
@@ -8901,7 +9543,7 @@ <h4>Keyboard actions</h4>
 
 <table class=simple>
  <tr>
-  <th><var>key</var>’s codepoint
+  <th><var>key</var>&apos;s codepoint
   <th>Description
   <th>Location
  </tr>
@@ -8909,6 +9551,7 @@ <h4>Keyboard actions</h4>
  <tr><td><code>\uE008</code></td><td>Left Shift</td><td><code>1</code></td></tr>
  <tr><td><code>\uE009</code></td><td>Left Control</td><td><code>1</code></td></tr>
  <tr><td><code>\uE00A</code></td><td>Left Alt</td><td><code>1</code></td></tr>
+ <tr><td><code>\uE019</code></td><td>Numpad =</td><td><code>3</code></td></tr>
  <tr><td><code>\uE01A</code></td><td>Numpad 0</td><td><code>3</code></td></tr>
  <tr><td><code>\uE01B</code></td><td>Numpad 1</td><td><code>3</code></td></tr>
  <tr><td><code>\uE01C</code></td><td>Numpad 2</td><td><code>3</code></td></tr>
@@ -8944,18 +9587,18 @@ <h4>Keyboard actions</h4>
  <tr><td><code>\uE05D</code></td><td>Numpad Delete<td><code>3</code></td></tr>
 </table>
 
-<p>To <dfn>dispatch a keyDown action</dfn> given <var>action object</var>,
-<var>source</var>, <var>global key state</var>, <var>tick
-duration</var>, and <var>browsing context</var>:
+<p>To <dfn>dispatch a keyDown action</dfn> given <var>action
+object</var>, <var>source</var>, <var>global key state</var>, <var>tick
+duration</var>, <var>browsing context</var>, and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Let <var>raw key</var> be equal to the
-  <var>action object</var>’s <code>value</code> property.
+  <var>action object</var>&apos;s <code>value</code> property.
 
  <li><p>Let <var>key</var> be equal to the <a>normalized key value</a>
   for <var>raw key</var>.
 
- <li><p>If the <var>source</var>’s <code>pressed</code> property
+ <li><p>If the <var>source</var>&apos;s <code>pressed</code> property
   contains <var>key</var>, let <var>repeat</var> be true, otherwise
   let <var>repeat</var> be false.
 
@@ -8972,18 +9615,18 @@ <h4>Keyboard actions</h4>
   keyboard, following the guidelines in [[UI-EVENTS]].
 
  <li><p>If <var>key</var> is <code>"Alt"</code>, let
-  <var>source</var>'s <code>alt</code> property be true.
+  <var>source</var>&apos;s <code>alt</code> property be true.
 
  <li><p>If <var>key</var> is <code>"Shift"</code>, let
-  <var>source</var>'s <code>shift</code> property be true.
+  <var>source</var>&apos;s <code>shift</code> property be true.
 
  <li><p>If <var>key</var> is <code>"Control"</code>, let
-  <var>source</var>'s <code>ctrl</code> property be true.
+  <var>source</var>&apos;s <code>ctrl</code> property be true.
 
  <li><p>If <var>key</var> is <code>"Meta"</code>, let
-  <var>source</var>'s <code>meta</code> property be true.
+  <var>source</var>&apos;s <code>meta</code> property be true.
 
- <li><p>Add <var>key</var> to <var>source</var>’s <code>pressed</code>
+ <li><p>Add <var>key</var> to <var>source</var>&apos;s <code>pressed</code>
  property.
 
  <li><p><a>Perform implementation-specific action dispatch steps</a>
@@ -9003,10 +9646,10 @@ <h4>Keyboard actions</h4>
      <tr><td><code>key</code><td><var>key</var>
      <tr><td><code>code</code><td><var>code</var>
      <tr><td><code>location</code><td><var>location</var>
-     <tr><td><code>altKey</code><td><var>source</var>’s <code>alt</code> property
-     <tr><td><code>shiftKey</code><td><var>source</var>’s <code>shift</code> property
-     <tr><td><code>ctrlKey</code><td><var>source</var>’s <code>ctrl</code> property
-     <tr><td><code>metaKey</code><td><var>source</var>’s <code>meta</code> property
+     <tr><td><code>altKey</code><td><var>source</var>&apos;s <code>alt</code> property
+     <tr><td><code>shiftKey</code><td><var>source</var>&apos;s <code>shift</code> property
+     <tr><td><code>ctrlKey</code><td><var>source</var>&apos;s <code>ctrl</code> property
+     <tr><td><code>metaKey</code><td><var>source</var>&apos;s <code>meta</code> property
      <tr><td><code>repeat</code><td><var>repeat</var>
      <tr><td><code>isComposing</code><td><var>false</var>
      <tr><td><code>charCode</code><td><var>charCode</var>
@@ -9024,10 +9667,10 @@ <h4>Keyboard actions</h4>
      <tr><td><code>key</code><td><var>key</var>
      <tr><td><code>code</code><td><var>code</var>
      <tr><td><code>location</code><td><var>location</var>
-     <tr><td><code>altKey</code><td><var>source</var>’s <code>alt</code> property
-     <tr><td><code>shiftKey</code><td><var>source</var>’s <code>shift</code> property
-     <tr><td><code>ctrlKey</code><td><var>source</var>’s <code>ctrl</code> property
-     <tr><td><code>metaKey</code><td><var>source</var>’s <code>meta</code> property
+     <tr><td><code>altKey</code><td><var>source</var>&apos;s <code>alt</code> property
+     <tr><td><code>shiftKey</code><td><var>source</var>&apos;s <code>shift</code> property
+     <tr><td><code>ctrlKey</code><td><var>source</var>&apos;s <code>ctrl</code> property
+     <tr><td><code>metaKey</code><td><var>source</var>&apos;s <code>meta</code> property
      <tr><td><code>repeat</code><td><var>repeat</var>
      <tr><td><code>isComposing</code><td><var>false</var>
      <tr><td><code>charCode</code><td><var>charCode</var>
@@ -9046,18 +9689,18 @@ <h4>Keyboard actions</h4>
 </aside>
 
 <p>To <dfn>dispatch a keyUp action</dfn> given, <var>action
-object</var>, <var>source</var>,
-<var>global key state</var>, <var>tick duration</var>,
-and <var>browsing context</var>:</p>
+object</var>, <var>source</var>, <var>global key state</var>,
+<var>tick duration</var>, <var>browsing context</var>,
+and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Let <var>raw key</var> be equal to
-  <var>action object</var>’s <code>value</code> property.
+  <var>action object</var>&apos;s <code>value</code> property.
 
  <li><p>Let <var>key</var> be equal to the
   <a>normalized key value</a> for <var>raw key</var>.
 
- <li><p>If the <var>source</var>’s <code>pressed</code> item
+ <li><p>If the <var>source</var>&apos;s <code>pressed</code> item
   does not contain <var>key</var>, return.
 
  <li><p>Let <var>code</var> be the <a>code</a> for
@@ -9074,19 +9717,19 @@ <h4>Keyboard actions</h4>
   keyboard, following the guidelines in [[UI-EVENTS]].
 
  <li><p>If <var>key</var> is "<code>Alt</code>", let
-  <var>source</var>'s <code>alt</code> property be false.
+  <var>source</var>&apos;s <code>alt</code> property be false.
 
  <li><p>If <var>key</var> is "<code>Shift</code>", let
-  <var>source</var>'s <code>shift</code> property be false.
+  <var>source</var>&apos;s <code>shift</code> property be false.
 
  <li><p>If <var>key</var> is <code>"Control"</code>, let
-  <var>source</var>'s <code>ctrl</code> property be false.
+  <var>source</var>&apos;s <code>ctrl</code> property be false.
 
  <li><p>If <var>key</var> is <code>"Meta"</code>, let
-  <var>source</var>'s <code>meta</code> property be false.
+  <var>source</var>&apos;s <code>meta</code> property be false.
 
  <li><p>Remove <var>key</var>
- from <var>sources</var>’s <code>pressed</code> property.
+ from <var>sources</var>&apos;s <code>pressed</code> property.
 
  <li><p><a>Perform implementation-specific action dispatch steps</a>
   on <var>browsing context</var> equivalent to releasing a key on the
@@ -9104,10 +9747,10 @@ <h4>Keyboard actions</h4>
      <tr><td><code>key</code><td><var>key</var></tr>
      <tr><td><code>code</code><td><var>code</var></tr>
      <tr><td><code>location</code><td><var>location</var></tr>
-     <tr><td><code>altKey</code><td><var>source</var>’s <code>altKey</code> property</tr>
-     <tr><td><code>shiftKey</code><td><var>source</var>’s <code>shift</code> property</tr>
-     <tr><td><code>ctrlKey</code><td><var>source</var>’s <code>ctrl</code> property</tr>
-     <tr><td><code>metaKey</code><td><var>source</var>’s <code>meta</code> property</tr>
+     <tr><td><code>altKey</code><td><var>source</var>&apos;s <code>altKey</code> property</tr>
+     <tr><td><code>shiftKey</code><td><var>source</var>&apos;s <code>shift</code> property</tr>
+     <tr><td><code>ctrlKey</code><td><var>source</var>&apos;s <code>ctrl</code> property</tr>
+     <tr><td><code>metaKey</code><td><var>source</var>&apos;s <code>meta</code> property</tr>
      <tr><td><code>repeat</code><td><var>false</var></tr>
      <tr><td><code>isComposing</code><td><var>false</var></tr>
      <tr><td><code>charCode</code><td><var>charCode</var></tr>
@@ -9124,60 +9767,61 @@ <h4>Keyboard actions</h4>
 <h4>Pointer actions</h4>
 
 <p>To <dfn>dispatch a pointerDown action</dfn> given
- <var>action object</var>, <var>input state</var>, <var>global key state</var>,
- <var>tick duration</var>, and <var>browsing context</var>:
+ <var>action object</var>, <var>source</var>, <var>global key
+ state</var>, <var>tick duration</var>, <var>browsing context</var>,
+ and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Let <var>pointerType</var> be equal to
-  <var>action object</var>’s <code>pointerType</code> property.
+  <var>action object</var>&apos;s <code>pointerType</code> property.
 
  <li><p>Let <var>button</var> be equal to
-  <var>action object</var>’s <code>button</code> property.
+  <var>action object</var>&apos;s <code>button</code> property.
 
- <li><p>If the <var>input state</var>’s <code>pressed</code> property
+ <li><p>If the <var>source</var>&apos;s <code>pressed</code> property
   contains <var>button</var> return <a>success</a> with data <a><code>null</code></a>.
 
- <li><p>Let <var>x</var> be equal to <var>input state</var>’s
+ <li><p>Let <var>x</var> be equal to <var>source</var>&apos;s
   <code>x</code> property.
 
- <li><p>Let <var>y</var> be equal to <var>input state</var>’s
+ <li><p>Let <var>y</var> be equal to <var>source</var>&apos;s
   <code>y</code> property.
 
  <li><p>Add <var>button</var> to the set corresponding to
-  <var>input state</var>’s <code>pressed</code> property, and
+  <var>source</var>&apos;s <code>pressed</code> property, and
   let <var>buttons</var> be the resulting value of that property.
 
- <li><p>Let <var>width</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>width</var> be equal to <var>action object</var>&apos;s
   <code>width</code> property.
 
- <li><p>Let <var>height</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>height</var> be equal to <var>action object</var>&apos;s
   <code>height</code> property.
 
- <li><p>Let <var>pressure</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>pressure</var> be equal to <var>action object</var>&apos;s
   <code>pressure</code> property.
 
  <li><p>Let <var>tangentialPressure</var> be equal to
-  <var>action object</var>’s <code>tangentialPressure</code> property.
+  <var>action object</var>&apos;s <code>tangentialPressure</code> property.
 
- <li><p>Let <var>tiltX</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>tiltX</var> be equal to <var>action object</var>&apos;s
   <code>tiltX</code> property.
 
- <li><p>Let <var>tiltY</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>tiltY</var> be equal to <var>action object</var>&apos;s
   <code>tiltY</code> property.
 
- <li><p>Let <var>twist</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>twist</var> be equal to <var>action object</var>&apos;s
   <code>twist</code> property.
 
- <li><p>Let <var>altitudeAngle</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>altitudeAngle</var> be equal to <var>action object</var>&apos;s
   <code>altitudeAngle</code> property.
 
- <li><p>Let <var>azimuthAngle</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>azimuthAngle</var> be equal to <var>action object</var>&apos;s
   <code>azimuthAngle</code> property.
 
  <li><p><a>Perform implementation-specific action dispatch steps</a>
   on <var>browsing context</var> equivalent to pressing the button
   numbered <var>button</var> on the pointer with pointerId equal
-  to <var>input source</var>'s pointerId, having
+  to <var>source</var>&apos;s pointerId, having
   type <var>pointerType</var> at viewport x coordinate <var>x</var>,
   viewport y coordinate <var>y</var>, <var>width</var>, <var>height</var>,
   <var>pressure</var>, <var>tangentialPressure</var>, <var>tiltX</var>,
@@ -9189,7 +9833,7 @@ <h4>Pointer actions</h4>
   corresponding items in <var>global key state</var>. Type specific
   properties for the pointer that are not exposed through the
   webdriver API must be set to the default value specified for
-  hardware that doesn’t support that property.
+  hardware that doesn&apos;t support that property.
 
  <!-- TODO: add some events that should be emitted? This is a bit
   complicated in this case because e.g. pointerDown is only emitted
@@ -9199,36 +9843,36 @@ <h4>Pointer actions</h4>
 </ol>
 
 <p>To <dfn>dispatch a pointerUp action</dfn> given, <var>action
-object</var>, <var>source</var>,
-<var>global key state</var>, <var>tick duration</var>,
-and <var>browsing context</var>:
+object</var>, <var>source</var>, <var>global key
+state</var>, <var>tick duration</var>, <var>browsing context</var>,
+and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Let <var>pointerType</var> be equal to
-  <var>action object</var>’s <code>pointerType</code> property.
+  <var>action object</var>&apos;s <code>pointerType</code> property.
 
  <li><p>Let <var>button</var> be equal to
-  <var>action object</var>’s <code>button</code> property.
+  <var>action object</var>&apos;s <code>button</code> property.
 
- <li><p>If the <var>source</var>’s <code>pressed</code> property
+ <li><p>If the <var>source</var>&apos;s <code>pressed</code> property
   does not contain <var>button</var>,
   return <a>success</a> with data <a><code>null</code></a>.
 
- <li><p>Let <var>x</var> be equal to <var>source</var>’s
+ <li><p>Let <var>x</var> be equal to <var>source</var>&apos;s
   <code>x</code> property.
 
- <li><p>Let <var>y</var> be equal to <var>source</var>’s
+ <li><p>Let <var>y</var> be equal to <var>source</var>&apos;s
   <code>y</code> property.
 
  <li><p>Remove <var>button</var> from the set corresponding
-  to <var>source</var>’s <code>pressed</code> property, and
+  to <var>source</var>&apos;s <code>pressed</code> property, and
   let <var>buttons</var> be the resulting value of that
   property.
 
  <li><p><a>Perform implementation-specific action dispatch steps</a>
   on <var>browsing context</var> equivalent to releasing the button
   numbered <var>button</var> on the pointer with pointerId equal
-  to <var>input source</var>'s pointerId, having
+  to <var>input source</var>&apos;s pointerId, having
   type <var>pointerType</var> at viewport x coordinate <var>x</var>,
   viewport y coordinate <var>y</var>, with buttons <var>buttons</var>
   depressed, in accordance with the requirements of [[UI-EVENTS]] and
@@ -9238,7 +9882,7 @@ <h4>Pointer actions</h4>
   corresponding items in <var>global key state</var>. Type specific
   properties for the pointer that are not exposed through the
   webdriver API must be set to the default value specified for
-  hardware that doesn’t support that property.
+  hardware that doesn&apos;t support that property.
 
   <!-- TODO: add some events that should be emitted? This is a bit
    complicated in this case because e.g. pointerDown is only emitted
@@ -9247,9 +9891,10 @@ <h4>Pointer actions</h4>
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
 
-<p>To <dfn>dispatch a pointerMove action</dfn> given
-<var>action object</var>, <var>source</var>, <var>global key state</var>,
-<var>tick duration</var>, and <var>browsing context</var>:
+<p>To <dfn>dispatch a pointerMove action</dfn> given <var>action
+object</var>, <var>source</var>, <var>global key state</var>,
+<var>tick duration</var>, <var>browsing context</var>,
+and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Let <var>x offset</var> be equal to the <code>x</code>
@@ -9258,50 +9903,18 @@ <h4>Pointer actions</h4>
  <li><p>Let <var>y offset</var> be equal to the <code>y</code>
   property of <var>action object</var>.
 
- <li><p>Let <var>start x</var> be equal to the <code>x</code>
-  property of <var>source</var>.
-
- <li><p>Let <var>start y</var> be equal to the <code>y</code>
-  property of <var>source</var>.
-
  <li><p>Let <var>origin</var> be equal to the <code>origin</code>
   property of <var>action object</var>.
 
- <li><p>Run the substeps of the first matching value
-  of <var>origin</var>:
-
-  <dl>
-   <dt>"<code>viewport</code>"
-   <dd><p>Let <var>x</var> equal <var>x offset</var> and
-    <var>y</var> equal <var>y offset</var>.</dd>
-
-   <dt>"<code>pointer</code>"
-   <dd><p>Let <var>x</var> equal <var>start x</var> +
-    <var>x offset</var> and <var>y</var> equal
-    <var>start y</var> + <var>y  offset</var>.</dd>
-
-   <dt>An object that <a>represents a web element</a></dt>
-   <dd>
-    <ol>
-     <li><p>Let <var>element</var> be equal to the result
-      of <a>trying</a> to <a>get a known connected element</a> with
-      argument <var>origin</var>.
-
-     <li><p>Let <var>x element</var> and <var>y element</var> be the
-      result of calculating the <a>in-view center point</a>
-      of <var>element</var>.
-
-     <li><p>Let <var>x</var> equal <var>x element</var> +
-      <var>x offset</var>, and <var>y</var> equal
-      <var>y element</var> + <var>y offset</var>.
-    </ol>
-   </dd>
-  </dl>
+ <li><p>Let (<var>x</var>, <var>y</var>) be the result
+  of <a>trying</a> to <a>get coordinates relative to an origin</a>
+  with <var>source</var>, <var>x offset</var>, <var>y offset</var>,
+  <var>origin</var>, <var>browsing context</var>, and <var>actions
+  options</var>.
 
  <li><p>If <var>x</var> is less than 0 or greater than the width of
-  the viewport in <a>CSS pixels</a>, then
-  return <a>error</a> with error code <a>move target out of
-  bounds</a>.
+  the viewport in <a>CSS pixels</a>, then return <a>error</a> with
+  error code <a>move target out of bounds</a>.
 
  <li><p>If <var>y</var> is less than 0 or greater than the height of
   the viewport in <a>CSS pixels</a>, then
@@ -9309,7 +9922,7 @@ <h4>Pointer actions</h4>
   bounds</a>.
 
  <li><p>Let <var>duration</var> be equal to
-  <var>action object</var>’s <code>duration</code> property if it
+  <var>action object</var>&apos;s <code>duration</code> property if it
   is not <a>undefined</a>, or <var>tick duration</var>
   otherwise.
 
@@ -9323,31 +9936,31 @@ <h4>Pointer actions</h4>
    vsync).</p></aside>
  </li>
 
- <li><p>Let <var>width</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>width</var> be equal to <var>action object</var>&apos;s
   <code>width</code> property.
 
- <li><p>Let <var>height</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>height</var> be equal to <var>action object</var>&apos;s
   <code>height</code> property.
 
- <li><p>Let <var>pressure</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>pressure</var> be equal to <var>action object</var>&apos;s
   <code>pressure</code> property.
 
  <li><p>Let <var>tangentialPressure</var> be equal to
-  <var>action object</var>’s <code>tangentialPressure</code> property.
+  <var>action object</var>&apos;s <code>tangentialPressure</code> property.
 
- <li><p>Let <var>tiltX</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>tiltX</var> be equal to <var>action object</var>&apos;s
   <code>tiltX</code> property.
 
- <li><p>Let <var>tiltY</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>tiltY</var> be equal to <var>action object</var>&apos;s
   <code>tiltY</code> property.
 
- <li><p>Let <var>twist</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>twist</var> be equal to <var>action object</var>&apos;s
   <code>twist</code> property.
 
- <li><p>Let <var>altitudeAngle</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>altitudeAngle</var> be equal to <var>action object</var>&apos;s
   <code>altitudeAngle</code> property.
 
- <li><p>Let <var>azimuthAngle</var> be equal to <var>action object</var>’s
+ <li><p>Let <var>azimuthAngle</var> be equal to <var>action object</var>&apos;s
   <code>azimuthAngle</code> property.
 
  <li><p><a>Perform a pointer move</a> with arguments
@@ -9402,11 +10015,11 @@ <h4>Pointer actions</h4>
 
   <ol>
    <li><p>Let <var>buttons</var> be equal to input
-    state’s <code>buttons</code> property.
+    state&apos;s <code>buttons</code> property.
 
    <li><p><a>Perform implementation-specific action dispatch steps</a>
     on <var>browsing context</var> equivalent to moving the pointer
-    with pointerId equal to <var>input source</var>'s pointerId,
+    with pointerId equal to <var>input source</var>&apos;s pointerId,
     having type <var>pointerType</var> from viewport x
     coordinate <var>current x</var>, viewport y
     coordinate <var>current y</var> to viewport x
@@ -9422,14 +10035,14 @@ <h4>Pointer actions</h4>
     corresponding items in <var>global key state</var>.  Type specific
     properties for the pointer that are not exposed through the
     WebDriver API must be set to the default value specified for
-    hardware that doesn’t support that property. In the case where
+    hardware that doesn&apos;t support that property. In the case where
     the <var>pointerType</var> is "<code>pen</code>" or
     "<code>touch</code>", and <var>buttons</var> is empty, this may be
     a no-op. For a pointer of type "<code>mouse</code>" this will
     always produce events including at least
     a <code>pointerMove</code> event.
 
-   <li><p>Let <var>input state</var>’s <code>x</code> property
+   <li><p>Let <var>input state</var>&apos;s <code>x</code> property
     equal <var>x</var> and <code>y</code> property
     equal <var>y</var>.
   </ol>
@@ -9469,14 +10082,15 @@ <h4>Pointer actions</h4>
 
 </ol>
 
-<p>To <dfn>dispatch a pointerCancel action</dfn> given
-<var>action object</var>, <var>source</var>, <var>global key state</var>,
-<var>tick duration</var>, and <var>browsing context</var>:
+<p>To <dfn>dispatch a pointerCancel action</dfn> given <var>action
+object</var>, <var>source</var>, <var>global key state</var>,
+<var>tick duration</var>, <var>browsing context</var>,
+and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p><a>Perform implementation-specific action dispatch steps</a>
   on <var>browsing context</var> equivalent to cancelling the any
-  action of the pointer with pointerId equal to <var>source</var>'s
+  action of the pointer with pointerId equal to <var>source</var>&apos;s
   pointerId item. having type <var>pointerType</var>, in accordance
   with the requirements of [[UI-EVENTS]] and [[POINTER-EVENTS]].
 
@@ -9488,9 +10102,10 @@ <h4>Pointer actions</h4>
 <section>
 <h4>Wheel actions</h4>
 
-<p>To <dfn>dispatch a scroll action</dfn> given
-<var>action object</var>, <var>source</var>, <var>global key state</var>,
-<var>tick duration</var>, and <var>browsing context</var>:
+<p>To <dfn>dispatch a scroll action</dfn> given <var>action
+object</var>, <var>source</var>, <var>global key state</var>,
+<var>tick duration</var>, <var>browsing context</var>,
+and <var>actions options</var>:
 
 <ol class="algorithm">
  <li><p>Let <var>x offset</var> be equal to the <code>x</code>
@@ -9502,31 +10117,11 @@ <h4>Wheel actions</h4>
  <li><p>Let <var>origin</var> be equal to the <code>origin</code>
   property of <var>action object</var>.
 
- <li><p>Run the substeps of the first matching value
-  of <var>origin</var>:
-
-  <dl>
-   <dt>"<code>viewport</code>"
-   <dd><p>Let <var>x</var> equal <var>x offset</var> and
-    <var>y</var> equal <var>y offset</var>.</dd>
-
-   <dt>An object that <a>represents a web element</a></dt>
-   <dd>
-    <ol>
-     <li><p>Let <var>element</var> be equal to the result
-      of <a>trying</a> to <a>get a known connected element</a> with
-      argument <var>origin</var>.
-
-     <li><p>Let <var>x element</var> and <var>y element</var> be the
-      result of calculating the <a>in-view center point</a>
-      of <var>element</var>.
-
-     <li><p>Let <var>x</var> equal <var>x element</var> +
-      <var>x offset</var>, and <var>y</var> equal
-      <var>y element</var> + <var>y offset</var>.
-    </ol>
-   </dd>
-  </dl>
+ <li><p>Let (<var>x</var>, <var>y</var>) be the result
+  of <a>trying</a> to <a>get coordinates relative to an origin</a>
+  with <var>source</var>, <var>x offset</var>, <var>y offset</var>,
+  <var>origin</var>, <var>browsing context</var>, and <var>actions
+  options</var>.
 
  <li><p>If <var>x</var> is less than 0 or greater than the width of
   the viewport in <a>CSS pixels</a>, then
@@ -9545,7 +10140,7 @@ <h4>Wheel actions</h4>
   property of <var>action object</var>.
 
  <li><p>Let <var>duration</var> be equal to
-  <var>action object</var>’s <code>duration</code> property if it
+  <var>action object</var>&apos;s <code>duration</code> property if it
   is not <a>undefined</a>, or <var>tick duration</var>
   otherwise.
 
@@ -9672,27 +10267,35 @@ <h3><dfn>Perform Actions</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol class="algorithm">
-  <li><p>Let <var>input state</var> be the result of <a>get the
-  input state</a> with <a>current session</a> and <a>current
-  top-level browsing context</a>.
+  <li><p>Let <var>input state</var> be the result of <a>get the input
+  state</a> with <var>session</var>
+  and <var>session</var>&apos;s <a>current top-level browsing
+  context</a>.
+
+ <li><p>Let <var>actions options</var> be a new <a>actions options</a>
+  with the <a>is element origin</a> steps set to <a>represents a web
+  element</a>, and the <a>get element origin</a> steps set
+  to <a>get a WebElement origin</a>.
 
  <li><p>Let <var>actions by tick</var> be the result of <a>trying</a>
-  to <a>extract an action sequence</a> given <var>input state</var>,
-  and <var>parameters</var>.
+  to <a>extract an action sequence</a> with <var>input state</var>,
+  <var>parameters</var>, and <var>actions options</var>.
 
- <li><p>If the <a>current browsing context</a> is <a>no longer
-  open</a>, return <a>error</a> with <a>error code</a> <a>no such
-  window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a>. If this results in
-  an <a>error</a>, return that <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+  with <var>session</var>.
 
- <li><p><a>Dispatch actions</a> given <var>input state</var>,
-  <var>actions by tick</var>, and <a>current browsing context</a>. If
-  this results in an <a>error</a> return that error.
+ <li><p><a>Dispatch actions</a> with <var>input state</var>,
+  <var>actions by tick</var>, <a>current browsing context</a>,
+  and <var>actions options</var>. If this results in an <a>error</a>
+  return that error.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -9717,29 +10320,38 @@ <h3><dfn>Release Actions</dfn></h3>
 The <a>Release Actions</a> <a>command</a>
 is used to release all the keys and pointer buttons
 that are currently depressed.
-This causes events to be <a>fired</a>
+This causes events to be [=fire an event|fired=]
 as if the state was released by an explicit series of actions.
 It also clears all the internal state of the virtual devices.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
  <li><p>Let <var>input state</var> be the result of <a>get the
- input state</a> with <a>current session</a> and <a>current
+ input state</a> with <a>session</a> and <a>current
  top-level browsing context</a>.
 
+ <li><p>Let <var>actions options</var> be a new <a>actions options</a>
+  with the <a>is element origin</a> steps set to <a>represents a web
+  element</a>, and the <a>get element origin</a> steps set
+  to <a>get a WebElement origin</a>.
+
  <li><p>Let <var>undo actions</var> be <var>input
- state</var>’s <a>input cancel list</a> in reverse order.
+ state</var>&apos;s <a>input cancel list</a> in reverse order.
 
  <li><p><a>Try</a> to <a>dispatch tick actions</a> with arguments
-  <var>undo actions</var>, <code>0</code>, and <a>current browsing
-  context</a>.
+  <var>undo
+  actions</var>, <code>0</code>,<var>session</var>&apos;s <a>current
+  browsing context</a>, and <a>actions options</a>.
 
- <li><p><a>Reset the input state</a> with <a>current session</a>
- and <a>current top-level browsing context</a>.
+ <li><p><a>Reset the input state</a> with <var>session</var>
+ and <var>session</var>&apos;s <a>current top-level browsing
+ context</a>.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
 </ol>
@@ -9750,11 +10362,11 @@ <h3><dfn>Release Actions</dfn></h3>
 <section>
 <h2>User prompts</h2>
 
-<p>This chapter describes interaction with various types of <a>user prompts</a>.
- The common denominator for user prompts is that they are
- modal windows requiring users to interact with them
- before the <a>event loop</a> is <a>unpaused</a>
- and control is returned to the <a>current top-level browsing context</a>.
+<p>This chapter describes interaction with various types of <a>user
+ prompts</a>.  The common denominator for user prompts is that they
+ are modal windows requiring users to interact with them before
+ the <a>event loop</a> is <a>unpaused</a> and control is returned
+ to <var>session</var>&apos;s <a>current top-level browsing context</a>.
 
 <p>By default <a>user prompts</a> are not handled automatically
  unless a <a>user prompt handler</a> has been defined.
@@ -9763,127 +10375,269 @@ <h2>User prompts</h2>
  If the subsequent requested <a>command</a> is not one listed in this chapter,
  an <a>unexpected alert open</a> <a>error</a> will be returned.
 
-<p><a>User prompts</a> that are spawned
- from <a><code>beforeunload</code></a> event handlers,
- are <a>dismissed</a> implicitly upon <a>navigation</a>
- or <a>close window</a>,
- regardless of the defined <a>user prompt handler</a>.
+<p>Whenever <a>active sessions</a> is a list containing exactly one
+item, and that item is a <a>HTTP session</a>, but is not a <a>BiDi
+session</a>, then in the <a>steps to fire beforeunload</a>,
+implementations must act as if showing an unload prompt is likely to
+be annoying, deceptive, or pointless.
+
+<p class=note>This means that beforeunload prompts are never shown
+when there&apos;s an active HTTP-only session.
 
 <p>A <a>user prompt</a> has an associated <dfn>user prompt message</dfn>
  that is the string message shown to the user,
  or <a><code>null</code></a> if the message length is <code>0</code>.
 
-<p>The following <dfn>table of simple dialogs</dfn>
- enumerates all supported <a>simple dialogs</a>,
- along with the <a>commands</a> that are allowed to interact with it
- as a non-normative reference:
+<p>To <dfn>get the active user prompt</dfn> given <var>browsing context</a>:
 
-<table class=simple>
- <tr>
-  <th>Definition
-  <th>Dialog
-  <th>Interactions
- </tr>
+<ol class=algorithm>
+ <li><p>Let <var>agent</var> be <a>browsing context</a>&apos;s <a>active
+ document</a>&apos;s <a>relevant agent</a>.
 
- <tr>
-  <td><dfn>Alert</dfn>
-  <td><a>window.<code>alert</code></a>
-  <td>
-   <a>Accept Alert</a><br />
-   <a>Dismiss Alert</a><br />
-   <a>Get Alert Text</a>
- </tr>
+ <li><p>If <var>agent</var>&apos;s <a>event loop</a> is not
+ currently <a data-cite=html>paused</a>, return null.
 
- <tr>
-  <td><dfn>Confirm</dfn>
-  <td><a>window.<code>confirm</code></a>
-  <td>
-   <a>Dismiss Alert</a><br />
-   <a>Accept Alert</a><br />
-   <a>Get Alert Text</a>
- </tr>
+ <li><p>Return the <a>user prompt</a> which handles the input required
+ to meet the condition passed when <var>event loop</var>
+ was <a data-cite=html>paused</a>.
+</ol>
 
- <tr>
-  <td><dfn>Prompt</dfn>
-  <td><a>window.<code>prompt</code></a>
-  <td>
-   <a>Dismiss Alert</a><br />
-   <a>Accept Alert</a><br />
-   <a>Get Alert Text</a><br />
-   <a>Send Alert Text</a>
- </tr>
-</table>
+<p>The <dfn>current user prompt</dfn> is the result of <a>get the
+active user prompt</a> with <a>current browsing context</a>.
 
-<p>The <dfn>current user prompt</dfn> is said to be the active <a>user prompt</a>,
- which can be one of the entries on the <a>table of simple dialogs</a>.
+<p>To <dfn data-lt="dismissed|dismisses">dismiss</dfn> a <a>user
+ prompt</a>, act as if the user clicked the <b>Cancel</b> button on
+ that prompt, if present, or otherwise <a>accept</a> the prompt.
 
-<p>To <dfn data-lt="dismissed|dismisses">dismiss</dfn>
- the <a>current user prompt</a>,
- do so as if the user would click the <b>Cancel</b> or <b>OK</b> button,
- whichever is present, in that order.
+<p>To <dfn data-lt="accepting|accepted|accepts">accept</dfn>
+ a <a>user prompt</a>, act as if the user clicked
+ the <b>OK</b> button on that prompt.
 
-<p>To <dfn data-lt="accepting|accepted|accepts">accept</dfn> the <a>current user prompt</a>,
- do so as if the user would click the <b>OK</b> button.
+<h3>User Prompt Handler</h3>
 
-<p>
-The <dfn>user prompt handler</dfn> defines what action
-the <a>remote end</a> must take when a <a>user prompt</a> is encountered.
-This is defined by the <a>unhandled prompt behavior</a> capability.
-The following <dfn>known prompt handling approaches table</dfn>
-lists the keywords and states for the attribute:
+<p>A <a>remote end</a> has a <dfn>user prompt handler</dfn> which
+defines how a WebDriver session will react when a user prompt is
+displayed. It is either null or a <a data-cite=infra>map</a> between strings
+and <a>prompt handler configuration</a> values. Initially it is null.
+
+<p>A <dfn>prompt handler configuration</dfn> is a <a>struct</a> with two
+items; a <dfn data-dfn-for="prompt handler configuration">handler</dfn>, which is a
+string, and a <dfn data-dfn-for="prompt handler configuration">notify</dfn>,
+which is a boolean.
+
+<p>To <dfn>serialize a prompt handler configuration</dfn>
+given <var>configuration</var>:
+
+<ol class=algorithm>
 
+ <li><p>Let <var>serialized</var>
+ be <var>configuration</var>&apos;s [=prompt handler
+ configuration/handler=].
+
+ <li><p>If «"<code>dismiss</code>", "<code>accept</code>"»
+ [=list/contains=] <var>serialized</var>,
+ and <var>configuration</var>&apos;s [=prompt handler
+ configuration/notify=] is true, append "<code> and notify</code>"
+ to <var>serialized</var>.
+
+ <li><p>Return <var>serialized</var>.
+
+</ol>
+
+The <dfn>known prompt handlers</dfn> are:
 <table class=simple>
  <tr>
-  <th>Keyword
-  <th>State
-  <th>Description
+  <th><dfn>Handler key</dfn>
+  <th>Description (non-normative).
  </tr>
 
  <tr>
   <td>"<code>dismiss</code>"
-  <td><dfn>Dismiss state</dfn>
   <td>All <a>simple dialogs</a> encountered should be <a>dismissed</a>.
  </tr>
 
  <tr>
   <td>"<code>accept</code>"
-  <td><dfn>Accept state</dfn>
   <td>All <a>simple dialogs</a> encountered should be <a>accepted</a>.
  </tr>
 
  <tr>
   <td>"<code>dismiss and notify</code>"
-  <td><dfn>Dismiss and notify state</dfn>
   <td>All <a>simple dialogs</a> encountered should be <a>dismissed</a>,
       and an error returned that the dialog was handled.
  </tr>
 
  <tr>
   <td>"<code>accept and notify</code>"
-  <td><dfn>Accept and notify state</dfn>
   <td>All <a>simple dialogs</a> encountered should be <a>accepted</a>,
       and an error returned that the dialog was handled.
  </tr>
 
  <tr>
   <td>"<code>ignore</code>"
-  <td><dfn>Ignore state</dfn>
   <td>All <a>simple dialogs</a> encountered should be left to the user to handle.
  </tr>
 </table>
 
-<p>When required to <dfn>deserialize as an unhandled prompt behavior</dfn> an
+<p>The <dfn>valid prompt types</dfn> are «"<code>alert</code>",
+"<code>beforeUnload</code>", "<code>confirm</code>",
+"<code>default</code>", "<code>prompt</code>"».
+
+<p class="note">The "<code>default</code>" type represents a fallback
+when no specific handler is defined for a given prompt type, including
+the "<code>beforeUnload</code>" prompt type. It can only be set if the
+unhandled prompt behavior is a <a data-cite=infra>map</a> which
+[=map/contains=] "<code>default</code>". For HTTP-only sessions setting
+unhandled prompt behavior as a string value, the value will be assigned to
+the internal type "<code>fallbackDefault</code>". The
+"<code>fallbackDefault</code>" value is not used for the
+"<code>beforeUnload</code>" prompt type, instead it falls back to the
+"<code>accept</code>" handler. This is because HTTP-only sessions do not
+allow the "<code>beforeUnload</code>" handler to be customized, and enabling
+other protocols isn&apos;t expected to change the user prompt handling as a
+side effect.
+
+<p>To <dfn>deserialize as an unhandled prompt behavior</dfn> given
 argument <var>value</var>:
 
-<ol>
- <li><p>If <var>value</var> is not a <a>string</a> return
-  an <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+<ol class=algorithm>
 
- <li><p>If <var>value</var> is not present as a <code>keyword</code>
-  in the <a>known prompt handling approaches table</a>
-  return an <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+ <!-- TODO - We should hoist this conversion into the capabilities processing, or even the
+      main request handling, but do it explicitly here for now to avoid a large refactor -->
+ <li><p>Set <var>value</far> to the result of <a>converting a
+ JSON-derived JavaScript value to an Infra value</a>
+ with <var>value</var>.
 
- <li><p>Return <a>success</a> with data <var>value</var>.
+ <li><p>If <var>value</var> is not a string, an implementation that
+ does not also support [[WebDriver-BiDi]] may return <a>error</a>
+ with <a>error code</a> <a>invalid argument</a>.
+
+ <p class="note">This is to avoid [[WebDriver-BiDi]] monkey-patching
+ the current spec.
+
+ <li><p>Let <var>is string value</var> be false.
+
+ <li><p>If <var>value</var> is a <a>string</a> set <var>value</var> to
+ the <a data-cite=infra>map</a> «["<code>fallbackDefault</code>"
+ → <var>value</var>]» and set <var>is string value</var> to true.
+
+ <li><p>If <var>value</var> is not a <a data-cite=infra>map</a> return
+ <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+
+ <li>Let <var>user prompt handler</var> be an empty <a data-cite=infra>map</a>.
+
+ <li><p>For each <var>prompt type</var> → <var>handler</var> in <var>value</var>:
+
+  <ol>
+   <li><p>If <var>is string value</var> is false and <a>valid prompt
+   types</a> does not [=map/contain=] <var>prompt type</var>
+   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+
+   <li><p>If <a>known prompt handlers</a> does not contain an entry
+   with <a>handler key</a> <var>handler</var> return <a>error</a>
+   with <a>error code</a> <a>invalid argument</a>.
+
+   <li><p>Let <var>notify</var> be false.
+
+   <li><p>If <var>handler</var> is "<code>accept and notify</code>",
+   set <var>handler<var> to "<code>accept</code>"
+   and <var>notify</var> to true.
+
+   <li><p>If <var>handler</var> is "<code>dismiss and notify</code>",
+   set <var>handler<var> to "<code>dismiss</code>"
+   and <var>notify</var> to true.
+
+   <li><p>If <var>handler</var> is "<code>ignore</code>",
+   set <var>notify</var> to true.
+
+   <li><p>Let <var>configuration</var> be a <a>prompt handler
+   configuration</a> with [=prompt handler
+   configuration/handler=] <var>handler</var> and [=prompt handler
+   configuration/notify=] <var>notify</var>.
+
+   <li><p>[=map/Set=] <var>user prompt
+   handler</var>[<var>prompt type</var>] to <var>configuration</var>.
+
+  </ol>
+ </li>
+
+ <li><p>Return <a>success</a> with data <var>user prompt handler</var>.
+</ol>
+
+<p>To <dfn>check user prompt handler matches</dfn>
+given <var>requested prompt handler</var>:
+
+<ol class="algorithm">
+ <li><p>If the <a>user prompt handler</a> is null, return true.
+
+ <li><p>For each <var>request prompt type</var> → <var>request handler</var>
+ in <var>requested prompt handler</var>:
+
+  <ol>
+   <li><p>If the <a>user prompt handler</a>
+   [=map/contains=] <var>request prompt type</var>:
+
+    <ol>
+
+     <li><p>If the <var>requested prompt handler</var>&apos;s [=prompt
+     handler configuration/handler=] is not equal to the <a>user
+     prompt handler</a>&apos;s [=prompt handler
+     configuration/handler=], return false.
+
+    </ol>
+   </li>
+ </ol>
+
+ <li>Return true</li>
+</ol>
+
+<p class="note">This does not check the <var>requested prompt
+handler</var>&apos;s [=prompt handler configuration/notify=] matches
+the [=prompt handler configuration/handler=], because the [=prompt
+handler configuration/notify=] component only affects the [=HTTP
+session=], if any.
+
+<p>To <dfn>update the user prompt handler</dfn> given <var>requested prompt handler</var>:
+
+<ol class=algorithm>
+
+ <li><p>If the <a>user prompt handler</a> is null, set the <a>user prompt
+ handler</a> to an empty map.
+
+ <li><p>For each <var>request prompt type</var> → <var>request handler</var>
+ in <var>requested prompt handler</var>:
+
+  <ol>
+   <li><p>Set <a>user prompt handler</a>[<var>request prompt type</var>]
+   to <var>request handler</var>.
+  </ol>
+
+</ol>
+
+<p>To <dfn>serialize the user prompt handler</dfn>:
+
+<ol class=algorithm>
+ <li><p>If the <a>user prompt handler</a> is null, return
+ "<code>dismiss and notify</code>".
+
+ <li><p>If the <a>user prompt handler</a> has [=map/size=] 1,
+ and <a>user prompt handler</a> [=list/contains=]
+ "<code>fallbackDefault</code>", return the result of <a>serialize a prompt
+ handler configuration</a> with <a>user prompt
+ handler</a>["<code>fallbackDefault</code>"].
+
+ <li><p>Let <var>serialized</var> be an empty <a data-cite=infra>map</a>.
+
+ <li><p>For each <var>key</var> → <code>value</code> of <a>user prompt
+ handler</a>:
+
+ <ol>
+  <li><p>Set <var>serialized</var>[<var>key</var>] to <a>serialize a prompt
+  handler configuration</a> with <var>value</var>.
+ </ol>
+
+ <li><p>Return <a>convert an Infra value to a JSON-compatible
+ JavaScript value</a> with <var>serialized</var>.
 </ol>
 
 <p>An <dfn>annotated unexpected alert open error</dfn>
@@ -9893,47 +10647,79 @@ <h2>User prompts</h2>
 
  <dl>
   <dt>"<code>text</code>"
-  <dd>The <a>current user prompt</a>’s
+  <dd>The <a>current user prompt</a>&apos;s
    <a data-lt="user prompt message">message</a>.
  </dl>
 
-<p>In order to <dfn>handle any user prompts</dfn>
- a <a>remote end</a> must take the following steps:
+<p>To <dfn class=export>get the prompt handler</dfn> <var>type</var>:
 
-<ol>
-<li><p>
-If there is no <a>current user prompt</a>,
-abort these steps and return <a>success</a>.
+<ol class=algorithm>
+ <li><p>If the <a>user prompt handler</a> is null,
+ let <var>handlers</var> be an empty map. Otherwise
+ let <var>handlers</var> be <a>user prompt handler</a>.
 
-<li><p>
-Perform the following substeps
-based on the <a>current session</a>’s <a>user prompt handler</a>:
+ <li><p>If <var>handlers</var> contains <var>type</var>
+ return <var>handlers</var>[<var>type</var>].
 
-<dl class=switch>
-<dt><a>dismiss state</a>
-<dd><p><a>Dismiss</a> the <a>current user prompt</a>.
+ <li><p>If <var>handlers</var> contains "<code>default</code>"
+ return <var>handlers</var>["<code>default</code>"].
 
-<dt><a>accept state</a>
-<dd><p><a>Accept</a> the <a>current user prompt</a>.
+ <li><p>If <var>type</var> is "<code>beforeUnload</code>", return a
+   <a>prompt handler configuration</a> with [=prompt
+   handler configuration/handler=] "<code>accept</code>"
+   and [=prompt handler configuration/notify=] false.
 
-<dt><a>dismiss and notify state</a>
-<dd>
-<ol>
-<li><p><a>Dismiss</a> the <a>current user prompt</a>.
-<li><p>Return an <a>annotated unexpected alert open error</a>.
-</ol>
+ <li><p>If <var>handlers</var> contains "<code>fallbackDefault</code>"
+ return <var>handlers</var>["<code>fallbackDefault</code>"].
 
-<dt><a>accept and notify state</a>
-<dd>
-<ol>
-<li><p><a>Accept</a> the <a>current user prompt</a>.
-<li><p>Return an <a>annotated unexpected alert open error</a>.
+ <li><p>Return a <a>prompt handler
+   configuration</a> with [=prompt handler
+   configuration/handler=] "<code>dismiss</code>" and [=prompt handler
+   configuration/notify=] true.
 </ol>
 
-<dt><a>ignore state</a>
-<dd><p>Return an <a>annotated unexpected alert open error</a>.
+<p>To <dfn>handle any user prompts</dfn>:
+
+<ol class=algorithm>
+ <li><p>If the <a>current browsing context</a> is not blocked by
+ a dialog return <a>success</a>.
+
+ <li><p>Let <var>type</var> be "<code>default</code>".
+
+ <li><p>If the <a>current user prompt</a> is an alert dialog,
+ set <var>type</var> to "<code>alert</code>". Otherwise, if
+ the <a>current user prompt</a> is a beforeunload dialog,
+ set <var>type</var> to "<code>beforeUnload</code>". Otherwise, if
+ the <a>current user prompt</a> is a confirm dialog,
+ set <var>type</var> to "<code>confirm</code>". Otherwise, if
+ the <a>current user prompt</a> is a prompt dialog,
+ set <var>type</var> to "<code>prompt</code>".
+
+ <!-- This can be extended naturally to print dialogs, which also pause the
+      event loop. File pickers as specified do _not_ pause the event queue, but
+      from the point of view of users they are similar and should be handled in
+      the same mechanism -->
+
+ <li><p>Let <var>handler</var> be <a>get the prompt handler</a>
+ with <var>type</var>.
+
+ <li><p> Perform the following substeps based
+ on <var>handler</var>&apos;s [=prompt handler configuration/handler=]:
+
+<dl class=switch>
+ <dt>"<code>accept</code>"
+ <dd><p><a>Accept</a> the <a>current user prompt</a>.
+
+ <dt>"<code>dismiss</code>"
+ <dd><p><a>Dismiss</a> the <a>current user prompt</a>.
+
+ <dt>"<code>ignore</code>"
+ <dd><p>Do nothing.
 </dl>
 
+<li><p>If <var>handler</var>&apos;s [=prompt handler configuration/notify=]
+is true, return <a>annotated unexpected alert open error</a>.
+
 <li><p>Return <a>success</a>.
 </ol>
 
@@ -9974,17 +10760,19 @@ <h3><dfn>Dismiss Alert</dfn></h3>
 The <a>Dismiss Alert</a> <a>command</a>
 <a>dismisses</a> a <a>simple dialog</a>
 if <a data-lt="current user prompt">present</a>.
-A request to <a>dismiss</a> an <a>alert</a> <a>user prompt</a>,
+A request to <a>dismiss</a> an alert <a>user prompt</a>,
 which may not necessarily have a dismiss button,
 has the same effect as <a>accepting</a> it.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p>If there is no <a>current user prompt</a>,
+ <li><p>If the <a>current user prompt</a> is null,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
 
  <li><p><a>Dismiss</a> the <a>current user prompt</a>.
@@ -10007,13 +10795,15 @@ <h3><dfn>Accept Alert</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p>If there is no <a>current user prompt</a>,
+ <li><p>If the <a>current user prompt</a> is null,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
 
  <li><p><a>Accept</a> the <a>current user prompt</a>.
@@ -10036,13 +10826,15 @@ <h3><dfn>Get Alert Text</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p>If there is no <a>current user prompt</a>,
+ <li><p>If the <a>current user prompt</a> is null,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
 
  <li><p>Let <var>message</var> be the text message
@@ -10072,7 +10864,8 @@ <h3><dfn>Send Alert Text</dfn></h3>
 sets the text field of a <a>window.<code>prompt</code></a>
 <a>user prompt</a> to the given value.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
  <li><p>Let <var>text</var> be the result of
@@ -10082,22 +10875,23 @@ <h3><dfn>Send Alert Text</dfn></h3>
  <li><p>If <var>text</var> is not a <a>String</a>,
   return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p>If there is no <a>current user prompt</a>,
+ <li><p>If the <a>current user prompt</a> is null,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
 
- <li><p>Run the substeps of the first matching
-  <a>current user prompt</a>:
+ <li><p>Run the substeps for the API that created the <a>current user
+ prompt</a>:
 
   <dl class=switch>
-   <dt><a>alert</a>
-   <dt><a>confirm</a>
+   <dt><a><code>window.alert</code></a>
+   <dt><a><code>window.confirm</code></a>
    <dd><p>Return <a>error</a> with
     <a>error code</a> <a>element not interactable</a>.
 
-   <dt><a>prompt</a>
+   <dt><a><code>window.prompt</code></a>
    <dd><p>Do nothing.
 
    <dt>Otherwise
@@ -10106,7 +10900,7 @@ <h3><dfn>Send Alert Text</dfn></h3>
   </dl>
 
  <li><p>Perform user agent dependent steps
-  to set the value of <a>current user prompt</a>’s text field
+  to set the value of <a>current user prompt</a>&apos;s text field
   to <var>text</var>.
 
  <li><p>Return <a>success</a> with data <a><code>null</code></a>.
@@ -10120,35 +10914,35 @@ <h2>Screen capture</h2>
 
 <p>Screenshots are a mechanism for providing
  additional visual diagnostic information.
- They work by dumping a snapshot of the <a>initial viewport</a>’s
+ They work by dumping a snapshot of the <a>initial viewport</a>&apos;s
  framebuffer as a lossless PNG image.
  It is returned to the <a>local end</a> as a Base64 encoded string.
 
 <p>WebDriver provides the <a>Take Screenshot</a> <a>command</a>
- to capture the <a>top-level browsing context</a>’s <a>initial viewport</a>,
+ to capture the <a>top-level browsing context</a>&apos;s <a>initial viewport</a>,
  and a <a>command</a> <a>Take Element Screenshot</a>
- for doing the same with the visible region of an <a>element</a>’s
+ for doing the same with the visible region of an <a>element</a>&apos;s
  <a>bounding rectangle</a> after it has been <a>scrolled into view</a>.
 
 <p>In order to <dfn>draw a bounding box from the framebuffer</dfn>,
  given a <a>rectangle</a>:
 
 <ol>
- <li><p>If either the <a>initial viewport</a>’s width or height
+ <li><p>If either the <a>initial viewport</a>&apos;s width or height
   is 0 <a>CSS pixels</a>,
   return <a>error</a> with <a>error code</a> <a>unable to capture screen</a>.
 
- <li><p>Let <var>paint width</var> be the <a>initial viewport</a>’s width –
+ <li><p>Let <var>paint width</var> be the <a>initial viewport</a>&apos;s width –
   <a>min</a>(<a>rectangle x coordinate</a>,
   <a>rectangle x coordinate</a> + <a>rectangle width dimension</a>).
 
- <li><p>Let <var>paint height</var> be the <a>initial viewport</a>’s height –
+ <li><p>Let <var>paint height</var> be the <a>initial viewport</a>&apos;s height –
   <a>min</a>(<a>rectangle y coordinate</a>,
   <a>rectangle y coordinate</a> + <a>rectangle height dimension</a>).
 
  <li><p>Let <var>canvas</var> be a new [^canvas^] element,
-  and set its <a data-lt="canvas width attribute">width</a>
-  and <a data-lt="canvas height attribute">height</a>
+  and set its [^canvas/width^]
+  and [^canvas/height^]
   to <var>paint width</var> and <var>paint height</var>, respectively.
 
  <li><p>Let <var>context</var>, a <a>canvas context mode</a>,
@@ -10180,26 +10974,26 @@ <h2>Screen capture</h2>
  Base64 a <code>canvas</code> <a>element</a></dfn>:
 
 <ol>
- <li><p>If the [^canvas^] element’s bitmap’s
+ <li><p>If the [^canvas^] element&apos;s bitmap&apos;s
   <a>origin-clean</a> flag is set to false,
   return <a>error</a> with <a>error code</a> <a>unable to capture screen</a>.
 
- <li><p>If the [^canvas^] element’s bitmap
+ <li><p>If the [^canvas^] element&apos;s bitmap
   has no pixels (i.e. either its horizontal dimension or vertical dimension is zero)
   then return <a>error</a> with <a>error code</a> <a>unable to capture screen</a>.
 
  <li><p>Let <var>file</var> be
-  <a>a serialization of the <code>canvas</code> element’s bitmap as a file</a>,
+  [=a serialization of the bitmap as a file|a serialization of the `canvas` element&apos;s bitmap as a file=],
   using "<code>image/png</code>" as an argument.
 
- <li><p>Let <var>data url</var> be a <a><code>data:</code> URL</a>
+ <li><p>Let <var>data URL</var> be a <a><code>data:</code> URL</a>
   representing <var>file</var>. [[RFC2397]]
 
  <li><p>Let <var>index</var> be the <a>index of</a> "<code>,</code>"
-  in <var>data url</var>.
+  in <var>data URL</var>.
 
  <li><p>Let <var>encoded string</var> be a <a>substring</a>
-  of <var>data url</var> using (<var>index</var> + 1) as the <i>start</i> argument.
+  of <var>data URL</var> using (<var>index</var> + 1) as the <i>start</i> argument.
 
  <li><p>Return <a>success</a> with data <var>encoded string</var>.
 </ol>
@@ -10218,28 +11012,31 @@ <h3><dfn>Take Screenshot</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
  <li><p>When the user agent is next to <a>run the animation frame callbacks</a>:
   <ol>
-   <li><p>Let <var>root rect</var> be the <a>current top-level browsing context</a>’s
-    <a>document element</a>’s <a>rectangle</a>.
+   <li><p>Let <var>root rect</var> be <var>session</var>&apos;s <a>current
+   top-level browsing context</a>&apos;s
+    <a>document element</a>&apos;s <a>rectangle</a>.
 
    <li><p>Let <var>screenshot result</var> be the result of <a>trying</a> to call
     <a>draw a bounding box from the framebuffer</a>,
     given <var>root rect</var> as an argument.
 
    <li><p>Let <var>canvas</var> be a [^canvas^] element
-    of <var>screenshot result</var>’s data.
+    of <var>screenshot result</var>&apos;s data.
 
    <li><p>Let <var>encoding result</var> be the result of <a>trying</a>
     <a>encoding a canvas as Base64</a> <var>canvas</var>.
 
-   <li><p>Let <var>encoded string</var> be <var>encoding result</var>’s data.
+   <li><p>Let <var>encoded string</var> be <var>encoding result</var>&apos;s data.
   </ol>
 
  <li><p>Return <a>success</a> with data <var>encoded string</var>.
@@ -10265,24 +11062,27 @@ <h3><dfn>Take Element Screenshot</dfn></h3>
 takes a screenshot of the visible region encompassed
 by the <a>bounding rectangle</a> of an <a>element</a>.
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current browsing context</a>
+  is <a>no longer open</a>, return <a>error</a> with <a>error
+  code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
  <li><p>Let <var>element</var> be the result of
-  <a>trying</a> to <a>get a known connected element</a>
-  with <a>url variable</a> <var>element id</var>.
+  <a>trying</a> to <a>get a known element</a> with <var>session</var>
+  and <var>URL variables</var>["<code>element id</code>"].
 
 <li>
   <p><a>Scroll into view</a> the <var>element</var>.
 
  <li><p>When the user agent is next to <a>run the animation frame callbacks</a>:
   <ol>
-   <li><p>Let <var>element rect</var> be <var>element</var>’s
+   <li><p>Let <var>element rect</var> be <var>element</var>&apos;s
     <a href=https://drafts.fxtf.org/geometry/#rectangle>rectangle</a>.
 
    <li><p>Let <var>screenshot result</var> be the result
@@ -10291,12 +11091,12 @@ <h3><dfn>Take Element Screenshot</dfn></h3>
     given <var>element rect</var> as an argument.
 
    <li><p>Let <var>canvas</var> be a [^canvas^] element
-    of <var>screenshot result</var>’s data.
+    of <var>screenshot result</var>&apos;s data.
 
    <li><p>Let <var>encoding result</var> be the result of <a>trying</a>
     <a>encoding a canvas as Base64</a> <var>canvas</var>.
 
-   <li><p>Let <var>encoded string</var> be <var>encoding result</var>’s data.
+   <li><p>Let <var>encoded string</var> be <var>encoding result</var>&apos;s data.
   </ol>
 
  <li><p>Return <a>success</a> with data <var>encoded string</var>.
@@ -10415,18 +11215,20 @@ <h3><dfn>Print Page</dfn></h3>
  </tr>
 </table>
 
-<p>The <a>remote end steps</a> are:
+<p>The <a>remote end steps</a>, given <var>session</var>, <var>URL
+variables</var> and <var>parameters</var> are:
 
 <ol>
- <li><p>If the <a>current top-level browsing context</a> is <a>no longer open</a>,
-  return <a>error</a> with <a>error code</a> <a>no such window</a>.
+ <li><p>If <var>session</var>&apos;s <a>current top-level browsing
+  context</a> is <a>no longer open</a>, return <a>error</a>
+  with <a>error code</a> <a>no such window</a>.
 
- <li><p><a>Handle any user prompts</a> and return its value if it is an <a>error</a>.
+ <li><p><a>Try</a> to <a>handle any user prompts</a>
+ with <var>session</var>.
 
  <li><p>Let <var>orientation</var> be the result of <a>getting a
-  property with default</a> named <code>orientation</code> and with
-  default "<code>portrait</code>" from the <var>parameters</var>
-  argument.
+  property with default</a> named "<code>orientation</code>" and with
+  default "<code>portrait</code>" from <var>parameters</var>.
 
  <li><p>If <var>orientation</var> is not a <a>String</a> or does not
  have one of the values "<code>landscape</code>" or
@@ -10434,30 +11236,30 @@ <h3><dfn>Print Page</dfn></h3>
  code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>scale</var> be the result of <a>getting a
-  property with default</a> named <code>scale</code> and with
-  default <code>1</code> from the <var>parameters</var> argument.
+  property with default</a> named "<code>scale</code>" and with
+  default <code>1</code> from <var>parameters</var>.
 
  <li><p>If <var>scale</var> is not a <a>Number</a>, or is less
  than <code>0.1</code> or greater than <code>2</code>
  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>background</var> be the result of <a>getting a
-  property with default</a> named <code>background</code> and with
-  default <code>false</code> from the <var>parameters</var> argument.
+  property with default</a> named "<code>background</code>" and with
+  default <code>false</code> from <var>parameters</var>.
 
  <li><p>If <var>background</var> is not a <a>Boolean</a>
  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>page</var> be the result of <a>getting a property
-  with default</a> named <code>page</code> and with a default of an
-  empty <a>Object</a> from the <var>parameters</var> argument.
+  with default</a> named "<code>page</code>" and with a default of an
+  empty <a>Object</a> from <var>parameters</var>.
 
  <li><p>Let <var>pageWidth</var> be the result of <a>getting a
-  property with default</a> named <code>width</code> and with a
+  property with default</a> named "<code>width</code>" and with a
   default of <code>21.59</code> from <var>page</var>.
 
  <li><p>Let <var>pageHeight</var> be the result of <a>getting a
-  property with default</a> named <code>height</code> and with a
+  property with default</a> named "<code>height</code>" and with a
   default of <code>27.94</code> from <var>page</var>.
 
  <li><p>If either of <var>pageWidth</var> or <var>pageHeight</var> is
@@ -10465,23 +11267,23 @@ <h3><dfn>Print Page</dfn></h3>
  with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>margin</var> be the result of <a>getting a property
-  with default</a> named <code>margin</code> and with a default of an
-  empty <a>Object</a> from the <var>parameters</var> argument.
+  with default</a> named "<code>margin</code>" and with a default of an
+  empty <a>Object</a> from <var>parameters</var>.
 
  <li><p>Let <var>marginTop</var> be the result of <a>getting a
-  property with default</a> named <code>top</code> and with a
+  property with default</a> named "<code>top</code>" and with a
   default of <code>1</code> from <var>margin</var>.
 
  <li><p>Let <var>marginBottom</var> be the result of <a>getting a
-  property with default</a> named <code>bottom</code> and with a
+  property with default</a> named "<code>bottom</code>" and with a
   default of <code>1</code> from <var>margin</var>.
 
  <li><p>Let <var>marginLeft</var> be the result of <a>getting a
-  property with default</a> named <code>left</code> and with a
+  property with default</a> named "<code>left</code>" and with a
   default of <code>1</code> from <var>margin</var>.
 
  <li><p>Let <var>marginRight</var> be the result of <a>getting a
-  property with default</a> named <code>right</code> and with a
+  property with default</a> named "<code>right</code>" and with a
   default of <code>1</code> from <var>margin</var>.
 
  <li><p>If any
@@ -10490,15 +11292,15 @@ <h3><dfn>Print Page</dfn></h3>
  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>shrinkToFit</var> be the result of <a>getting a
-  property with default</a> named <code>shrinkToFit</code> and with
-  default <code>true</code> from the <var>parameters</var> argument.
+  property with default</a> named "<code>shrinkToFit</code>" and with
+  default <code>true</code> from <var>parameters</var>.
 
  <li><p>If <var>shrinkToFit</var> is not a <a>Boolean</a>
  return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
 
  <li><p>Let <var>pageRanges</var> be the result of <a>getting a
-  property with default</a> named <code>pageRanges</code> from
-  the <var>parameters</var> argument with default of an
+  property with default</a> named "<code>pageRanges</code>" from
+  <var>parameters</var> with default of an
   empty <a>Array</a>.
 
  <li><p>If <var>pageRanges</var> is not an <a>Array</a>
@@ -10507,8 +11309,9 @@ <h3><dfn>Print Page</dfn></h3>
  <li><p>When the user agent is next to <a>run the animation frame
  callbacks</a>, let <var>pdfData</var> be the result of <a>trying</a>
  to take UA-specific steps to generate a paginated representation of
- the <a>current browsing context</a>, with the CSS <a>media type</a> set
- to <code>print</code>, encoded as a PDF, with the following paper settings:
+ <var>session</var>&apos;s <a>current browsing context</a>, with the
+ CSS <a>media type</a> set to <code>print</code>, encoded as a PDF,
+ with the following paper settings:
    <table>
      <tr>
        <th>Property
@@ -10556,7 +11359,7 @@ <h3><dfn>Print Page</dfn></h3>
   <li><p>Let <var>encoding result</var> be the result of
   calling <a>Base64 Encode</a> on <var>pdfData</var>.
 
-  <li><p>Let <var>encoded string</var> be <var>encoding result</var>’s data.
+  <li><p>Let <var>encoded string</var> be <var>encoding result</var>&apos;s data.
 
   <li><p>Return <a>success</a> with data <var>encoded string</var>
 </ol>
@@ -10625,37 +11428,43 @@ <h2>Element displayedness</h2>
  to ascertain the visibility of an <a>element</a> in the <a>viewport</a>,
  we acknowledge that it is an important feature for many users.
  Here we include a recommended approach
- which will give a simplified approximation of an <a>element</a>’s visibility,
+ which will give a simplified approximation of an <a>element</a>&apos;s visibility,
  but please note that it relies only on tree-traversal,
  and only covers a subset of visibility checks.
 
 <p>The visibility of an <a>element</a> is guided
  by what is perceptually visible to the human eye.
- In this context, an <a>element</a>’s displayedness
+ In this context, an <a>element</a>&apos;s displayedness
  does not relate to the <a><code>visibility</code></a>
  or <a><code>display</code></a> style properties.
 
 <p>The approach recommended to implementors to ascertain
- an <a>element</a>’s visibility was originally developed by
+ an <a>element</a>&apos;s visibility was originally developed by
  the <a href=https://selenium.dev>Selenium</a> project, and is
- based on crude approximations about an <a>element</a>'s nature and
+ based on crude approximations about an <a>element</a>&apos;s nature and
  relationship in the tree.  An <a>element</a> is in general to be
  considered visible if any part of it is drawn on the canvas within
  the boundaries of the viewport.
 
-<p>The <dfn data-lt="element displayedness|not displayed">element displayed</dfn> algorithm
- is a boolean state where <code>true</code> signifies that the element is displayed
- and <code>false</code> signifies that the element is not displayed.
- To compute the state on <var>element</var>,
- invoke the <a>Function.[[\Call]]</a>(<a><code>null</code></a>, <var>element</var>,
- <code>false</code>),
- with <a><code>bot.dom.isShown</code></a> as the this value.
- If doing so does not produce an error,
- return the return value from this function call.
- Otherwise return an <a>error</a> with <a>error code</a> <a>unknown error</a>.
-
-<p>This function is typically exposed to <code>GET</code> requests
- with a <a>URI Template</a> of
+<p>The <dfn>element displayed state</dfn> is a boolean representing
+whether an element is currently visible.
+
+<p>To get the <a>element displayed state</a> using
+the <a><code>bot.dom.isShown</code></a> Selenium atoms,
+given <var>element</var>:
+ <ol>
+  <li><p>Let <var>function</var> be
+  the <a><code>bot.dom.isShown</code></a> function.
+  <li><p>Let <var>result</var> be the result of calling <var>function</var>&apos;s
+  <a data-link-for="Function">[[\Call]]</a> internal method with arguments
+  null and <var>element</var>. If this raises an exception, return
+  an <a>error</a> with <a>error code</a> <a>unknown error</a>.
+
+  <li><p>Return <a>success</a> with data <var>result</var>.
+</p>
+
+<p>The <a>element displayed state</a> is typically exposed as an
+ endpoint for <code>GET</code> requests with a <a>URI Template</a> of
  <code>/session/{session id}/element/{element id}/displayed</code>.
 </section> <!-- /Element displayedness -->
 
@@ -10780,49 +11589,11 @@ <h2>Index</h2>
 
 
  <dt>DOM
- <dd><p>The following terms are defined
-  in the Document Object Model specification: [[DOM]]
-  <ul>
-   <!-- Attribute --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-attribute>Attribute</a></dfn>
-   <!-- compareDocumentPosition --> <li><dfn><a href=https://dom.spec.whatwg.org/#dom-node-comparedocumentposition>compareDocumentPosition</a></dfn>
-   <!-- connected --> <li><dfn><a href=https://dom.spec.whatwg.org/#connected>connected</a></dfn>
-   <!-- Descendant --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-tree-descendant>Descendant</a></dfn>
-   <!-- Document element --> <li><dfn><a href=https://dom.spec.whatwg.org/#document-element>Document element</a></dfn>
-   <!-- Document --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-document>Document</a></dfn>
-   <!-- DOCUMENT_POSITION_DISCONNECTED --> <li><dfn><a href=https://dom.spec.whatwg.org/#dom-node-document_position_disconnected>DOCUMENT_POSITION_DISCONNECTED</a></dfn> (1)
-   <!-- document fragment host --> <li><dfn data-lt="document fragment host"><a href=https://dom.spec.whatwg.org/#concept-documentfragment-host><code>document fragment host</code></a></dfn>
-   <!-- DOCUMENT_FRAGMENT_NODE --> <li><dfn data-lt="DOCUMENT_FRAGMENT_NODE"><a href="https://dom.spec.whatwg.org/#dom-node-document_fragment_node">DOCUMENT_FRAGMENT_NODE</a></dfn></li>
-   <!-- Document type --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-document-type>Document type</a></dfn>
-   <!-- Document URL --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-document-url>Document URL</a></dfn>
-   <!-- Element --> <li><dfn data-lt=elements><a href=https://dom.spec.whatwg.org/#concept-element>Element</a></dfn>
-   <!-- Equals --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-node-equals>Equals</a></dfn>
-   <!-- Event --> <li><dfn><a href=https://dom.spec.whatwg.org/#event>Event</a></dfn>
-   <!-- Fire an event --> <li><dfn data-lt="fire|fires|fired|event fires|event fired|event firing"><a href=https://dom.spec.whatwg.org/#concept-event-fire>Fire an event</a></dfn>
-   <!-- Get an attribute by name --> <li><dfn data-lt="getting an attribute by name"><a href=https://dom.spec.whatwg.org/#concept-element-attributes-get-by-name>Get an attribute by name</a></dfn>
-   <!-- getAttribute --> <li><dfn><a href=https://dom.spec.whatwg.org/#dom-element-getattribute>getAttribute</a></dfn>
-   <!-- getElementsByTagName --> <li><dfn><a href="https://dom.spec.whatwg.org/#dom-element-getelementsbytagname"><code>getElementsByTagName</code></a></dfn>
-   <!-- hasAttribute --> <li><dfn data-lt="has the attribute"><a href=https://dom.spec.whatwg.org/#dom-element-hasattribute>hasAttribute</a></dfn>
-   <!-- HTMLCollection --> <li><dfn><a href=https://dom.spec.whatwg.org/#htmlcollection><code>HTMLCollection</code></a></dfn>
-   <!-- Inclusive descendant --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-tree-inclusive-descendant>Inclusive descendant</a></dfn>
-   <!-- Node length --> <li><dfn><a href="https://dom.spec.whatwg.org/#concept-node-length">Node Length</a></dfn>
-   <!-- Node --> <li><dfn><a href=https://dom.spec.whatwg.org/#concept-node>Node</a></dfn>
-   <!-- querySelector --> <li><dfn><a href="https://dom.spec.whatwg.org/#dom-parentnode-queryselector"><code>querySelector</code></a></dfn>
-   <!-- tagName --> <li><dfn><a href=https://dom.spec.whatwg.org/#dom-element-tagname>tagName</a></dfn>
-   <!-- Text node --> <li><dfn><a href=https://dom.spec.whatwg.org/#text><code>Text</code> node</a></dfn>
-  </ul>
-
- <dd><p>The following attributes are defined
-  in the Document Object Model specification: [[DOM]]
-  <ul>
-   <!-- textContent attribute --> <li><dfn data-lt=textContent><a href=https://dom.spec.whatwg.org/#dom-node-textcontent><code>textContent</code> attribute</a></dfn>
-  </ul>
-
  <dd><p>The following terms are defined in
   the DOM Parsing and Serialization specification: [[DOM-PARSING]]
   <ul>
    <!-- fragment serializing algorithm --> <li><dfn><a href="https://w3c.github.io/DOM-Parsing/#dfn-fragment-serializing-algorithm">fragment serializing algorithm</a></dfn>
    <!-- innerHTML IDL Attribute--> <li><dfn><a href=https://w3c.github.io/DOM-Parsing/#dom-innerhtml-innerhtml><code>innerHTML</code> IDL attribute</a></dfn>
-   <!-- outerHTML IDL Attribute--> <li><dfn><a href=https://w3c.github.io/DOM-Parsing/#dom-element-outerhtml><code>outerHTML</code> IDL attribute</a></dfn>
    <!-- serializeToString --> <li><dfn data-lt="serializing to string"><a href=https://w3c.github.io/DOM-Parsing/#dom-xmlserializer-serializetostring><code>serializeToString</code> method</a></dfn>
   </ul>
 
@@ -10831,25 +11602,12 @@ <h2>Index</h2>
   <ul>
    <!-- Activation trigger --> <li><dfn><a href=https://w3c.github.io/uievents/#activation-trigger>Activation trigger</a></dfn>
    <!-- click event --> <li><dfn><a href="https://w3c.github.io/uievents/#event-type-click">click event</a></dfn>
-   <!-- Keyboard Event --> <li><dfn><a href=https://w3c.github.io/uievents/#keyboardevent>Keyboard event</a></dfn>
-   <!-- Keyboard event order --> <li><dfn><a href=https://w3c.github.io/uievents/#events-keyboard-event-order>Keyboard event order</a></dfn>
-   <!-- keyDown event --> <li><dfn data-lt="keyDown-Event"><a href=https://w3c.github.io/uievents/#event-type-keydown>keyDown event</a></dfn>
-   <!-- keyPress event --> <li><dfn data-lt="keyPress-Event"><a href=https://w3c.github.io/uievents/#event-type-keypress>keyPress event</a></dfn>
-   <!-- keyUp event --> <li><dfn data-lt="keyUp-Event"><a href=https://w3c.github.io/uievents/#event-type-keyup>keyUp event</a></dfn>
    <!-- mouseDown event --> <li><dfn><a href=https://w3c.github.io/uievents/#event-type-mousedown>mouseDown event</a></dfn>
-   <!-- Mouse event --> <li><dfn><a href=https://w3c.github.io/uievents/#mouseevent>Mouse event</a></dfn>
-   <!-- Mouse event order --> <li><dfn><a href=https://w3c.github.io/uievents/#events-mouseevent-event-order>Mouse event order</a></dfn>
    <!-- mouseMove event --> <li><dfn><a href="https://w3c.github.io/uievents/#event-type-mousemove">mouseMove event</a></dfn>
    <!-- mouseOver event --> <li><dfn><a href="https://w3c.github.io/uievents/#event-type-mouseover">mouseOver event</a></dfn>
    <!-- mouseUp event --> <li><dfn><a href=https://w3c.github.io/uievents/#event-type-mouseup>mouseUp event</a></dfn>
   </ul>
 
- <dd><p>The following attributes are defined
-  in the UI Events Code specification: [[UIEVENTS-CODE]]
-  <ul>
-   <li><dfn data-lt="keyboard event code"><a href=https://www.w3.org/TR/uievents-code/#code-value-tables>Keyboard event code tables</a></dfn>
-  </ul>
-
  <dd><p>The following attributes are defined
   in the UI Events Code specification: [[UIEVENTS-KEY]]
   <ul>
@@ -10876,16 +11634,14 @@ <h2>Index</h2>
    <!-- Type --> <li><dfn data-lt="ecmascript type" data-lt-noDefault><a href=https://tc39.github.io/ecma262/#sec-ecmascript-data-types-and-values>Type</a></dfn>
    <!-- Use strict directive --> <li><dfn><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-14.1>Use strict directive</a></dfn>
    <!-- parseInt --> <li><dfn><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-15.1.2.2>parseInt</a></dfn>
-   <!-- parseFloat --> <li><dfn><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-15.1.2.3>parseFloat</a></dfn>
    <!-- realm --> <li><dfn><a href="https://tc39.github.io/ecma262/#sec-code-realms">realm</a></dfn>
   </ul>
 
  <dd>This specification also presumes that you are able to call
-  some of the <dfn data-lt="internal method"><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-8.6.2>internal methods</a></dfn>
+  some of the <a href=https://www.ecma-international.org/ecma-262/5.1/#sec-8.6.2>internal methods</a>
   from the ECMAScript Language Specification [[ECMAScript]]:
   <ul>
    <!-- Call --> <li><dfn data-dfn-for="Function"><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-13.2.1>[[\Call]]</a></dfn>
-   <!-- Class --> <li><dfn data-dfn-for="Object"><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-8.6.2>[[\Class]]</a></dfn>
    <!-- GetOwnProperty --> <li><dfn data-dfn-for="Object"><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-8.12.1>[[\GetOwnProperty]]</a></dfn>
    <!-- GetProperty --> <li><dfn data-dfn-for="Object"><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-8.12.2>[[\GetProperty]]</a></dfn>
    <!-- Index of --> <li><dfn><a href=https://www.ecma-international.org/ecma-262/5.1/#sec-15.5.4.7>Index of</a></dfn>
@@ -10921,6 +11677,7 @@ <h2>Index</h2>
  <dd><p>The following terms are defined in the WHATWG Fetch specification: [[FETCH]]
   <ul>
    <!-- Body --> <li><dfn><a href=https://fetch.spec.whatwg.org/#concept-request-body>Body</a></dfn>
+   <!-- default User-Agent value --> <li><dfn><a href=https://fetch.spec.whatwg.org/#default-user-agent-value>default User-Agent value</a></dfn>
    <!-- Header --> <li><dfn><a href="https://fetch.spec.whatwg.org/#concept-header">Header</a></dfn>
    <!-- Header Name --> <li><dfn><a href="https://fetch.spec.whatwg.org/#concept-header-name">Header Name</a></dfn>
    <!-- Header Value --> <li><dfn><a href="https://fetch.spec.whatwg.org/#concept-header-value">Header Value</a></dfn>
@@ -10933,84 +11690,53 @@ <h2>Index</h2>
    <!-- Status message --> <li><dfn><a href=https://fetch.spec.whatwg.org/#concept-response-status-message>Status message</a></dfn>
   </ul>
 
- <dt>File
- <dd><p>The following interfaces are defined in the W3C File API specification: [[FILEAPI]]
-  <ul>
-   <!-- FileList --> <li><dfn><a href=https://w3c.github.io/FileAPI/#dfn-filelist><code>FileList</code></a></dfn>
-  </ul>
-
  <dt>Fullscreen
  <dd><p>The following terms are defined in the WHATWG Fullscreen specification: [[FULLSCREEN]]
    <ul>
-     <!-- Fullscreen element --> <li><dfn><a href="https://fullscreen.spec.whatwg.org/#fullscreen-element">Fullscreen element</a></dfn>
      <!-- Fullscreen an element --> <li><dfn><a href="https://fullscreen.spec.whatwg.org/#fullscreen-an-element">Fullscreen an element</a></dfn>
-     <!-- Fullscreen is supported --> <li><dfn  data-lt='support fullscreen'><a href="https://fullscreen.spec.whatwg.org/#fullscreen-is-supported">Fullscreen is supported</a></dfn>
+     <!-- Fullscreen is supported --> <li><dfn  data-lt="support fullscreen"><a href="https://fullscreen.spec.whatwg.org/#fullscreen-is-supported">Fullscreen is supported</a></dfn>
      <!-- Fully exit fullscreen --> <li><dfn><a href="https://fullscreen.spec.whatwg.org/#fully-exit-fullscreen">fully exit fullscreen</a></dfn>
-     <!-- Unfullscreen a document --> <li><dfn><a href="https://fullscreen.spec.whatwg.org/#unfullscreen-a-document">unfullscreen a document</a></dfn>
    </ul>
 
  <dt>HTML
  <dd><p>The following terms are defined in the HTML specification: [[HTML]]
   <ul>
    <!-- 2D context creation algorithm --> <li><dfn><a href=https://html.spec.whatwg.org/#2d-context-creation-algorithm>2D context creation algorithm</a></dfn>
-   <!-- A browsing context is discarded --> <li><dfn data-lt=discarded><a href=https://html.spec.whatwg.org/#a-browsing-context-is-discarded>A browsing context is discarded</a></dfn>
-   <!-- A serialization of the bitmap as a file --> <li><dfn data-lt="a serialization of the canvas element’s bitmap as a file"><a href=https://html.spec.whatwg.org/#a-serialisation-of-the-bitmap-as-a-file>A serialization of the bitmap as a file</a></dfn>
+   <!-- A serialization of the bitmap as a file --> <li><dfn data-lt="a serialization of the bitmap as a file"><a href=https://html.spec.whatwg.org/#a-serialisation-of-the-bitmap-as-a-file>A serialization of the bitmap as a file</a></dfn>
    <!-- API length --> <li><dfn><a href="https://html.spec.whatwg.org/#concept-fe-api-value">API value</a></dfn>
-   <!-- Active document --> <li><dfn><a href=https://html.spec.whatwg.org/#active-document>Active document</a></dfn>
+   <!-- Active document --> <li><dfn><a href=https://html.spec.whatwg.org/#active-document>active document</a></dfn>
    <!-- Active element --> <li><dfn>Active element</dfn> being the <a href=https://html.spec.whatwg.org/#dom-document-activeelement><code>activeElement</code></a> attribute on <a href=https://html.spec.whatwg.org/#document><code>Document</code></a>
    <!-- Associated window --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-document-window>Associated window</a></dfn>
-   <!-- Body element --> <li><dfn><a href=https://html.spec.whatwg.org/#the-body-element><code>body</code> element</a></dfn>
    <!-- Boolean attribute --> <li><dfn><a href=https://html.spec.whatwg.org/#boolean-attribute>Boolean attribute</a></dfn>
    <!-- Browsing context --> <li><dfn data-lt="browsing contexts"><a href=https://html.spec.whatwg.org/#browsing-context>Browsing context</a></dfn>
-   <!-- Button --> <li><dfn><a href="https://html.spec.whatwg.org/#button-state-%28type=button%29">Button</a></dfn> state
-   <!-- Buttons --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-button>Buttons</a></dfn>
+   <!-- Browsing context group --> <li><dfn><a href=https://html.spec.whatwg.org/#browsing-context-group>Browsing context group</a></dfn>
    <!-- Candidate for constraint validation --> <li><dfn><a href=https://html.spec.whatwg.org/#candidate-for-constraint-validation>Candidate for constraint validation</a></dfn>
    <!-- Canvas context mode --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-canvas-context-mode>Canvas context mode</a></dfn>
    <!-- Checkbox --> <li><dfn><a href="https://html.spec.whatwg.org/#checkbox-state-%28type=checkbox%29">Checkbox</a></dfn> state
    <!-- Checkedness --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-fe-checked>Checkedness</a></dfn>
    <!-- Child browsing context --> <li><dfn><a href=https://html.spec.whatwg.org/#child-browsing-context>Child browsing context</a></dfn>
-   <!-- Clean up after running a callback --> <li><dfn><a href="https://html.spec.whatwg.org/#clean-up-after-running-a-callback">Clean up after running a callback</a></dfn>
-   <!-- Clean up after running a script --> <li><dfn><a href="https://html.spec.whatwg.org/#clean-up-after-running-script">Clean up after running a script</a></dfn>
    <!-- Close a browsing context --> <li><dfn data-lt="close|closes"><a href=https://html.spec.whatwg.org/#close-a-browsing-context>Close a browsing context</a></dfn>
-   <!-- Code entry-point --> <li><dfn><a href=https://html.spec.whatwg.org/#code-entry-point>Code entry-point</a></dfn>
    <!-- Cookie-averse Document object --> <li><dfn><a href=https://html.spec.whatwg.org/#cookie-averse-document-object>Cookie-averse <code>Document</code> object</a></dfn>
-   <!-- Current entry --> <li><dfn><a href=https://html.spec.whatwg.org/#current-entry>Current entry</a></dfn>
    <!-- Dirty checkedness flag --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-input-checked-dirty-flag>Dirty checkedness flag</a></dfn>
    <!-- Dirty value flag --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-fe-dirty>Dirty value flag</a></dfn>
-   <!-- Disabled --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-fe-disabled>Disabled</a></dfn>
-   <!-- Document address --> <li><dfn data-lt=address><a href=https://dom.spec.whatwg.org/#concept-document-url>Document address</a></dfn>
+   <!-- Disabled --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-element-disabled>Actually disabled</a></dfn>
    <!-- Document readiness --> <li><dfn><a href=https://html.spec.whatwg.org/#current-document-readiness>Document readiness</a></dfn>
-   <!-- Document title --> <li><dfn data-lt=title><a href=https://html.spec.whatwg.org/#document.title>Document title</a></dfn>
    <!-- Element contexts --> <li><dfn data-lt="element context"><a href=https://html.spec.whatwg.org/#concept-element-contexts>Element contexts</a></dfn>
    <!-- Enumerated attribute --> <li><dfn><a href=https://html.spec.whatwg.org/#enumerated-attribute>Enumerated attribute</a></dfn>
-   <!-- Environment settings object --> <li><dfn><a href=https://html.spec.whatwg.org/#environment-settings-object>Environment settings object</a></dfn>
    <!-- Event loop --> <li><dfn><a href=https://html.spec.whatwg.org/#event-loop>Event loop</a></dfn>
-   <!-- File --> <li><dfn><a href="https://html.spec.whatwg.org/#file-upload-state-%28type=file%29">File</a></dfn> state
    <!-- File upload state --> <li><dfn><a href="https://html.spec.whatwg.org/#file-upload-state-(type=file)">File upload state</a></dfn>
    <!-- Focusing steps --> <li><dfn><a href="https://html.spec.whatwg.org/#focusing-steps">Focusing steps</a></dfn>
    <!-- Fousable area --><li><dfn><a href=https://html.spec.whatwg.org/#focusable-area>Focusable area</a></dfn>
    <!-- GetOwnProperty of a Window object --> <li><dfn data-lt="window.[[\getOwnProperty]]"><a href=https://html.spec.whatwg.org/#windowproxy-getownproperty><code>[[\GetOwnProperty]]</code> of a <code>Window</code> object</a></dfn>
-   <!-- HTMLAllCollection --> <li><dfn><a href=https://html.spec.whatwg.org/#htmlallcollection><code>HTMLAllCollection</code></a></dfn>
-   <!-- HTMLFormControlCollection --> <li><dfn><a href=https://html.spec.whatwg.org/#htmlformcontrolscollection><code>HTMLFormControlsCollection</code></a></dfn>
-   <!-- HTMLOptionsCollection --> <li><dfn><a href=https://html.spec.whatwg.org/#htmloptionscollection><code>HTMLOptionsCollection</code></a></dfn>
-   <!-- Hidden --> <li><dfn><a href="https://html.spec.whatwg.org/#hidden-state-%28type=hidden%29">Hidden</a></dfn> state
-   <!-- Image Button --> <li><dfn><a href="https://html.spec.whatwg.org/#image-button-state-%28type=image%29">Image Button</a></dfn> state
-   <!-- In parallel --> <li><dfn><a href="https://html.spec.whatwg.org/#in-parallel">In parallel</a></dfn>
-   <!-- Input event applies --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-input-apply><code>input</code> event applies</a></dfn>
    <!-- Input type file selected --> <li><dfn><a href="https://html.spec.whatwg.org/#concept-input-type-file-selected">Selected Files</a></dfn>
    <!-- Joint session history --> <li><dfn><a href=https://html.spec.whatwg.org/#joint-session-history>Joint session history</a></dfn>
    <!-- Mature (navigation) --> <li><dfn data-lt="matured"><a href=https://html.spec.whatwg.org/#concept-navigate-mature>Mature</a></dfn> navigation.
-   <!-- Missing value default state --> <li><dfn><a href=https://html.spec.whatwg.org/#missing-value-default>Missing value default state</a></dfn>
    <!-- Mutable --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-fe-mutable>Mutable</a></dfn>
    <!-- Navigate --> <li><dfn data-lt="navigating|navigation"><a href=https://html.spec.whatwg.org/#navigate>Navigate</a></dfn>
-   <!-- Navigator --> <li><dfn data-lt="navigator"><a href=https://html.spec.whatwg.org/#navigator>Navigator object</a></dfn>
-   <!-- Nested browsing context --> <li><dfn><a href=https://html.spec.whatwg.org/#nested-browsing-context>Nested browsing context</a></dfn>
    <!-- Origin-clean --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-canvas-origin-clean>Origin-clean</a></dfn>
    <!-- Overridden reload --> <li><dfn><a href="https://html.spec.whatwg.org/multipage/dom.html#an-overridden-reload">An overridden reload</a></dfn>
    <!-- Parent browsing context --> <li><dfn><a href=https://html.spec.whatwg.org/#parent-browsing-context>Parent browsing context</a></dfn>
    <!-- Pause --> <li><dfn data-lt=unpaused><a href=https://html.spec.whatwg.org/#pause>HTML Pause</a></dfn>
-   <!-- Prepare to run a callback --> <li><dfn><a href="https://html.spec.whatwg.org/#prepare-to-run-a-callback">Prepare to run a callback</a></dfn>
-   <!-- Prepare to run a script --> <li><dfn><a href="https://html.spec.whatwg.org/#prepare-to-run-script">Prepare to run a script</a></dfn>
    <!-- Prompt to unload a document --> <li><dfn data-lt="prompting to unload"><a href=https://html.spec.whatwg.org/#prompt-to-unload-a-document>Prompt to unload a document</a></dfn>
    <!-- Radio button --> <li><dfn><a href="https://html.spec.whatwg.org/#radio-button-state-%28type=radio%29">Radio Button</a></dfn> state
    <!-- Raw value --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-textarea-raw-value>Raw value</a></dfn>
@@ -11019,19 +11745,11 @@ <h2>Index</h2>
    <!-- Resettable element --> <li><dfn data-lt="resettable elements|resettable"><a href=https://html.spec.whatwg.org/#category-reset>Resettable element</a></dfn>
    <!-- Run the animation frame callbacks --> <li><dfn><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#run-the-animation-frame-callbacks">Run the animation frame callbacks</a></dfn>
    <!-- Satisfies its constraints --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-fv-valid>Satisfies its constraints</a></dfn>
-   <!-- Script --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-script>Script</a></dfn>
-   <!-- Script execution environment --> <li><dfn><a href=https://html.spec.whatwg.org/#environment>Script execution environment</a></dfn>
    <!-- Selectedness --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-option-selectedness>Selectedness</a></dfn>
-   <!-- Session history --> <li><dfn><a href=https://html.spec.whatwg.org/#session-history>Session history</a></dfn>
-   <!-- Settings object --> <li><dfn><a href=https://html.spec.whatwg.org/#settings-object>Settings object</a></dfn>
    <!-- Simple dialogs --> <li><dfn data-lt="simple dialog"><a href=https://html.spec.whatwg.org/#simple-dialogs>Simple dialogs</a></dfn>
-   <!-- Submit Button --> <li><dfn><a href="https://html.spec.whatwg.org/#submit-button-state-%28type=submit%29">Submit Button</a></dfn> state
-   <!-- Submittable elements --> <li><dfn data-lt="submittable element"><a href=https://html.spec.whatwg.org/#category-submit>Submittable elements</a></dfn>
+   <!-- Steps to fire beforeunload --> <li><dfn><a href=https://html.spec.whatwg.org/#steps-to-fire-beforeunload>Steps to fire beforeunload</a></dfn>
    <!-- Suffering from bad input --> <li><dfn><a href=https://html.spec.whatwg.org/#suffering-from-bad-input>Suffering from bad input</a></dfn>
-   <!-- Top-level browsing context --> <li><dfn data-lt="top-level browsing contexts"><a href=https://html.spec.whatwg.org/#top-level-browsing-context>Top-level browsing context</a></dfn>
-   <!-- Traverse the history --> <li><dfn data-lt="traversing the history"><a href=https://html.spec.whatwg.org/#traverse-the-history>Traverse the history</a></dfn>
    <!-- Traverse the history by a delta --> <li><dfn><a href=https://html.spec.whatwg.org/#traverse-the-history-by-a-delta>Traverse the history by a delta</a></dfn>
-   <!-- Tree order --> <li><dfn><a href=https://html.spec.whatwg.org/#tree-order>Tree order</a></dfn>
    <!-- Unfocusing steps --><li><dfn><a href=https://html.spec.whatwg.org/#unfocusing-steps>unfocusing steps</a></dfn>
    <!-- User prompt --> <li><dfn data-lt="user prompts"><a href=https://html.spec.whatwg.org/#user-prompts>User prompt</a></dfn>
    <!-- Value --> <li><dfn><a href=https://html.spec.whatwg.org/#concept-fe-value>Value</a></dfn>
@@ -11040,30 +11758,14 @@ <h2>Index</h2>
    <!-- Window object --> <li><dfn><a href=https://html.spec.whatwg.org/#the-window-object><code>Window</code></a></dfn> object
    <!-- Window open steps --> <li><dfn><a href=https://html.spec.whatwg.org/#window-open-steps>Window open steps</a></dfn>
    <!-- WindowProxy exotic object --> <li><dfn><a href=https://html.spec.whatwg.org/#windowproxy><code>WindowProxy</code></a></dfn> exotic object
-   <!-- WorkerNavigator --> <li><dfn data-lt="workernavigator"><a href=https://html.spec.whatwg.org/#workernavigator>WorkerNavigator object</a></dfn>
    <!-- setSelectionRange --> <li><dfn data-lt="set selection range"><a href=https://html.spec.whatwg.org/#dom-textarea/input-setselectionrange><code>setSelectionRange</code></a></dfn>
    <!-- window confirm --> <li><dfn>window.<a href=https://html.spec.whatwg.org/#dom-confirm><code>confirm</code></a></dfn>
    <!-- window.alert --> <li><dfn>window.<a href=https://html.spec.whatwg.org/#dom-alert><code>alert</code></a></dfn>
    <!-- window.prompt --> <li><dfn>window.<a href=https://html.spec.whatwg.org/#dom-prompt><code>prompt</code></a></dfn>
   </ul>
 
- <dd><p>The HTML specification also defines a number of elements
-  which this specification has special-cased behavior for:
-  <ul>
-   <!-- area element --> <li><dfn data-lt=area><a href=https://html.spec.whatwg.org/#the-area-element><code>area</code> element</a></dfn>
-   <!-- datalist element --> <li><dfn data-lt=datalist><a href=https://html.spec.whatwg.org/#the-datalist-element><code>datalist</code> element</a></dfn>
-   <!-- frame element --> <li><dfn data-lt=frame><a href=https://html.spec.whatwg.org/#frame><code>frame</code> element</a></dfn>
-   <!-- HTML Element --> <li><dfn><a href=https://html.spec.whatwg.org/#the-html-element><code>html</code> element</a></dfn>
-   <!-- iframe element --> <li><dfn data-lt=iframe><a href=https://html.spec.whatwg.org/#the-iframe-element><code>iframe</code> element</a></dfn>
-   <!-- input element --> <li><dfn data-lt="input elements"><a href=https://html.spec.whatwg.org/#the-input-element><code>input</code> element</a></dfn>
-   <!-- map element --> <li><dfn><a href=https://html.spec.whatwg.org/#the-map-element><code>map</code> element</a></dfn>
-   <!-- option element --> <li><dfn data-lt="option elements|option"><a href=https://html.spec.whatwg.org/#the-option-element><code>option</code> element</a></dfn>
-   <!-- output element --> <li><dfn data-lt=output><a href=https://html.spec.whatwg.org/#the-output-element><code>output</code> element</a></dfn>
-   <!-- select element --> <li><dfn data-lt="code elements"><a href=https://html.spec.whatwg.org/#the-select-element><code>select</code> element</a></dfn>
-  </ul>
-
  <dd><p>The HTML specification also defines <em>states</em>
-  of the <a><code>input</code> element</a>:
+  of the [^input^] element:
   <ul>
    <!-- Color state --> <li><dfn><a href="https://html.spec.whatwg.org/#color-state-(type=color)">Color state</a></dfn>
    <!-- Date state --> <li><dfn><a href="https://html.spec.whatwg.org/#date-state-(type=date)">Date state</a></dfn>
@@ -11082,13 +11784,8 @@ <h2>Index</h2>
 
  <dd><p>The HTML specification also defines a range of different attributes:
   <ul>
-   <!-- Canvas height attribute --> <li><dfn data-lt="canvas height attribute"><a href=https://html.spec.whatwg.org/#attr-canvas-height><code>canvas</code>’s height attribute</a></dfn>
-   <!-- Canvas width attribute --> <li><dfn data-lt="canvas width attribute"><a href=https://html.spec.whatwg.org/#attr-canvas-width><code>canvas</code>’ width attribute</a></dfn>
    <!-- Checked content attribute --> <li><dfn><a href=https://html.spec.whatwg.org/#attr-input-checked>Checked</a></dfn>
    <!-- Multiple attribute --> <li><dfn><a href=https://html.spec.whatwg.org/#attr-input-multiple><code>multiple</code> attribute</a></dfn>
-   <!-- readOnly attribute --> <li><dfn><a href=https://html.spec.whatwg.org/#the-readonly-attribute><code>readOnly</code> attribute</a></dfn>
-   <!-- Type attribute --> <li><dfn data-lt=type><a href=https://html.spec.whatwg.org/#attr-input-type><code>type</code> attribute</a></dfn>
-   <!-- Value attribute --><li><dfn><a href=https://html.spec.whatwg.org/#dom-input-value><code>value</code> attribute</a></dfn>
   </ul>
 
  <dd><p>The HTML Editing APIs specification defines the following terms: [[EDITING]]
@@ -11099,7 +11796,6 @@ <h2>Index</h2>
 
  <dd><p>The following events are also defined in the HTML specification:
   <ul>
-   <!-- beforeunload --> <li><dfn><a href=https://html.spec.whatwg.org/#event-beforeunload><code>beforeunload</code></a></dfn>
    <!-- change --> <li><dfn><a href="https://html.spec.whatwg.org/multipage/indices.html#event-change"><code>change</code></a></dfn>
    <!-- DOMContentLoaded --> <li><dfn><a href=https://html.spec.whatwg.org/#event-domcontentloaded><code>DOMContentLoaded</code></a></dfn>
    <!-- input --> <li><dfn><a href=https://html.spec.whatwg.org/#event-input><code>input</code></a></dfn>
@@ -11138,6 +11834,13 @@ <h2>Index</h2>
    <!-- Status code registry --> <li><dfn><a href=https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml>Status code registry</a></dfn>
   </ul>
 
+ <dt>Infra
+ <dd><p>The following terms are defined in the Infra specification: [[INFRA]]
+   <ul>
+    <!-- convert an Infra value to a JSON-compatible JavaScript value --> <li><dfn><a href="https://infra.spec.whatwg.org/#convert-an-infra-value-to-a-json-compatible-javascript-value">convert an Infra value to a JSON-compatible JavaScript value</a></dfn>
+    <!-- converting a JSON-derived JavaScript value to an Infra value --> <li><dfn><a href="https://infra.spec.whatwg.org/#convert-a-json-derived-javascript-value-to-an-infra-value">converting a JSON-derived JavaScript value to an Infra value</a></dfn>
+   </ul>
+
  <dd>The following terms are defined in
   the Netscape Navigator Proxy Auto-Config File Format:
   <ul>
@@ -11159,10 +11862,10 @@ <h2>Index</h2>
  <dt>Selenium
  <dd>The following functions are defined within
   the <a href=https://selenium.dev>Selenium</a> project, at
-  revision <code>1721e627e3b5ab90a06e82df1b088a33a8d11c20</code>.
+  revision <code>33c6b7841a59aaaad55744909c0600f066fd5593</code>.
   <ul>
-   <!-- bot.dom.getVisibleText --> <li><dfn><a href=https://github.com/SeleniumHQ/selenium/blob/a6b161a159c3d581b130f03a2e6e35f577f38dec/javascript/atoms/dom.js#L1007><code>bot.dom.getVisibleText</code></a></dfn>
-   <!-- bot.dom.isShown --> <li><dfn><a href=https://github.com/SeleniumHQ/selenium/blob/a6b161a159c3d581b130f03a2e6e35f577f38dec/javascript/atoms/dom.js#L573><code>bot.dom.isShown</code></a></dfn>
+    <!-- bot.dom.getVisibleText --> <li><dfn><a href=https://github.com/SeleniumHQ/selenium/blob/a6b161a159c3d581b130f03a2e6e35f577f38dec/javascript/atoms/dom.js#L1007><code>bot.dom.getVisibleText</code></a></dfn>
+    <!-- bot.dom.isShown --> <li><dfn><a href=https://github.com/SeleniumHQ/selenium/blob/a6b161a159c3d581b130f03a2e6e35f577f38dec/javascript/atoms/dom.js#L573><code>bot.dom.isShown</code></a></dfn>
   </ul>
 
  <dt>Styling
@@ -11215,14 +11918,10 @@ <h2>Index</h2>
  <dd>The following functions are defined in
   the CSSOM View Module: [[CSSOM-VIEW]]:
   <ul>
-   <!-- elementFromPoint --> <li><dfn>Element from point</dfn> as <a href="https://drafts.csswg.org/cssom-view/#dom-document-elementfrompoint">elementFromPoint()</a>
    <!-- elementsFromPoint --> <li><dfn data-lt="paint order|paint tree">Elements from point</dfn> as <a href=https://drafts.csswg.org/cssom-view/#dom-document-elementsfrompoint>elementsFromPoint()</a>
    <!-- innerHeight --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-window-innerheight>innerHeight</a></dfn>
    <!-- innerWidth --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-window-innerwidth>innerWidth</a></dfn>
    <!-- moveTo --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-window-moveto>moveTo(x, y)</a></dfn>
-   <!-- offsetLeft --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-htmlelement-offsetleft>offsetLeft</a></dfn>
-   <!-- offsetParent --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-htmlelement-offsetparent>offsetParent</a></dfn>
-   <!-- offsetTop --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-htmlelement-offsettop>offsetTop</a></dfn>
    <!-- outerHeight --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-window-outerheight>outerHeight</a></dfn>
    <!-- outerWidth --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-window-outerwidth>outerWidth</a></dfn>
    <!-- screenX --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dom-window-screenx>screenX</a></dfn>
@@ -11240,14 +11939,14 @@ <h2>Index</h2>
    <!-- media type --> <li><dfn><a href=https://www.w3.org/TR/mediaqueries-4/#media-types>media type</a></dfn>
   </ul>
 
- <dt>SOCKS Proxy and related specification:
- <dd><p>To be <dfn>SOCKS Proxy</dfn>
-  and <dfn data-lt=authenticating>SOCKS authentication</dfn> compliant,
-  it is supposed that the implementation supports the relevant subsets of
-  [[RFC1928]] and [[RFC1929]].
+ <dt>SOCKS Proxy:
+ <dd><p>The following terms are defined in the standard: [[RFC1928]]
+  <ul>
+   <li><dfn><a href=https://datatracker.ietf.org/doc/html/rfc1928>SOCKS Proxy</a></dfn>
+  </ul>
 
  <dt>Unicode
- <dd>The following terms are defined in the  standard: [[Unicode]]
+ <dd>The following terms are defined in the standard: [[Unicode]]
   <ul>
    <!-- Code point --> <li><dfn data-lt="unicode code point"><a href=https://www.unicode.org/versions/Unicode9.0.0/ch03.pdf#G2212>Code Point</a></dfn>
    <!-- Extended grapheme cluster --> <li><dfn data-lt="grapheme cluster"><a href=https://www.unicode.org/versions/Unicode9.0.0/ch03.pdf#G2213>Extended grapheme cluster</a></dfn>
@@ -11274,8 +11973,6 @@ <h2>Index</h2>
    <!-- Domain --><li><dfn data-lt="domains"><a href="https://url.spec.whatwg.org/#concept-domain">Domain</a></dfn>
    <!-- Host --> <li><dfn><a href="https://url.spec.whatwg.org/#concept-host">Host</a></dfn>
    <!-- includes credentials --> <li><dfn><a href="https://url.spec.whatwg.org/#include-credentials">Includes credentials</a></dfn>
-   <!-- IPv4 address --> <li><dfn data-lt="ipv4 addresses"><a href="https://url.spec.whatwg.org/#concept-ipv4">IPv4 address</a></dfn>
-   <!-- IPv6 address --> <li><dfn data-lt="ipv6 addresses"><a href="https://url.spec.whatwg.org/#concept-ipv6">IPv6 address</a></dfn>
    <!-- Is Special --> <li><dfn><a href="https://url.spec.whatwg.org/#is-special">Is special</a></dfn>
    <!-- Path-absolute URL --> <li><dfn><a href=https://url.spec.whatwg.org/#syntax-url-path-absolute>Path-absolute URL</a></dfn>
    <!-- Path --> <li><dfn><a href=https://url.spec.whatwg.org/#concept-url-path>Path</a></dfn>
@@ -11290,7 +11987,6 @@ <h2>Index</h2>
   as described in the Web IDL specification. [[WEBIDL]]
   <ul>
    <!-- DOMException --> <li><dfn><a href="https://heycam.github.io/webidl/#dfn-DOMException"><code>DOMException</code></a></dfn>
-   <!-- Sequence --> <li><dfn><a href="https://heycam.github.io/webidl/#idl-sequence">Sequence</a></dfn>
    <!-- Supported property indices --> <li><dfn data-lt="supported property index"><a href=https://heycam.github.io/webidl/#dfn-supported-property-indices>Supported property indices</a></dfn>
    <!-- SyntaxError --> <li><dfn><a href="https://heycam.github.io/webidl/#syntaxerror"><code>SyntaxError</code></a></dfn></li>
    <!-- this --> <li><dfn><a href="https://heycam.github.io/webidl/#this">this</a></dfn></li>
@@ -11300,13 +11996,7 @@ <h2>Index</h2>
   <dt>Promises Guide <!-- Eventually this will be merged into WebIDL -->
   <dd><p>The following terms are defined in the Promises Guide. [[PROMISES-GUIDE]]
     <ul>
-      <!-- Promise calling --> <li><dfn data-lt='promise-call'><a href="https://www.w3.org/2001/tag/doc/promises-guide#promise-calling">Promise-calling</a></dfn>
-    </ul>
-
-  <dt>XML Namespaces
-  <dd><p>The following terms are defined in the Namespaces in XML [[XML-NAMES]]
-    <ul>
-      <!-- qualified element name --><li><dfn><a href="https://www.w3.org/TR/REC-xml-names/#ns-using">qualified element name</a></dfn>
+      <!-- Promise calling --> <li><dfn data-lt="promise-call"><a href="https://www.w3.org/2001/tag/doc/promises-guide#promise-calling">Promise-calling</a></dfn>
     </ul>
 
   <dt>XPATH