From 7ca26261931f12d6ad23faaf8f96816b1961428c Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Fri, 9 Jul 2021 14:08:00 +0100
Subject: [PATCH 1/2] Allow for multiple WebDriver sessions

With BiDi we want to support multiple sessions, at most one of which
can also enable the HTTP frontend. Therefore we add the concept of
multiple sessions, which can have different flags set according to the
protocols they support (http, bidi, etc.).

This explictly passes the session, parameters and url variables down
into each command. In addition the URL variables are handled as a
infra struct rather than as a custom thing with implied variables.

Instead of having a concept of the "current session" we explicitly
pass the session around where required.
---
 index.html | 2293 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 1263 insertions(+), 1030 deletions(-)

diff --git a/index.html b/index.html
index 502eb9ef..7899d9fe 100644
--- a/index.html
+++ b/index.html
@@ -274,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
@@ -306,19 +307,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>
@@ -421,112 +420,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>’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>’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>’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>'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>'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>’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>’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>.
 
- <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>’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>’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>’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>
@@ -597,16 +597,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.
 
@@ -631,10 +629,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’s <a>URI
+  template</a> does not have a valid expansion equal to
+  to <var>URL</var>’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>.
@@ -649,13 +647,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>'s <var>URI template</var>.
 
  <li><p>Let <var>command</var> be <var>entry</var>’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>'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 -->
 
@@ -1063,7 +1067,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>{
@@ -1206,7 +1210,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>'s <a>current browsing context</a>’s <a>active document</a>.
  </tr>
 
  <tr>
@@ -1373,7 +1377,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>
@@ -1464,7 +1468,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>
@@ -1531,14 +1535,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 loading strategy</a>.
+  <td>Defines the <a>session</a>’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>’s <a>proxy configuration</a>.
  </tr>
 
  <tr>
@@ -1559,14 +1563,14 @@ <h2>Capabilities</h2>
   <td><dfn>Strict file interactability</dfn>
   <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>’s <a>strict file interactability</a>.
  </tr>
 
  <tr>
   <td><dfn>Unhandled prompt behavior</dfn>
   <td>"<code>unhandledPromptBehavior</code>"
   <td>string
-  <td>Describes the <a>current session</a>’s <a>user prompt handler</a>.
+  <td>Describes the <a>session</a>’s <a>user prompt handler</a>.
    Defaults to the <a>dismiss and notify state</a>.
  </tr>
 </table>
@@ -1739,9 +1743,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>
@@ -1761,7 +1766,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>
@@ -1784,8 +1789,8 @@ <h3>Processing capabilities</h3>
   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>.
@@ -1845,7 +1850,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>"
@@ -1962,9 +1967,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>
@@ -1991,7 +1998,18 @@ <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>.
+  </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
@@ -2085,9 +2103,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
@@ -2095,11 +2113,11 @@ <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>’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
@@ -2116,7 +2134,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
@@ -2128,8 +2146,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>.
@@ -2141,29 +2160,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
@@ -2173,28 +2173,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 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 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>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
@@ -2203,31 +2202,23 @@ <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
+<p>An <a>HTTP 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>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>.  Unless stated otherwise, it
+ is <a>normal</a>.
 
-<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 <a>strict file
+ interactability</a> state which is a boolean.
 
-<p>
-A <a>session</a> has an associated <a>user prompt handler</a>.
+<p>A <a>HTTP session</a> has an associated <a>user prompt handler</a>.
 Unless stated otherwise it is in the <a>dismiss and notify state</a>.
 
 <p>A <a>session</a> has an associated <dfn>browsing context input
@@ -2235,25 +2226,144 @@ <h2>Sessions</h2>
 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 specficiations 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'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'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>'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>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>’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>’s <a>strict file interactability</a> to
+            <var>strictFileInteractability</var>. Otherwise set
+            <a>session</a>’s <a>strict file interactability</a> to false.</p></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>
+      </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>.
+
+  <li><p>If <var>flags</var> contains "<code>http</code>",
+   append <var>session</var> to <a>active HTTP sessions</a>.
 
-<p>When asked to <dfn>close the session</dfn>,
+  <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>If <var>session</var>'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>’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>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>
@@ -2264,8 +2374,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,
@@ -2351,12 +2459,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
@@ -2374,100 +2485,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>,
   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>'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>'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
@@ -2496,11 +2545,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>
@@ -2541,7 +2591,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>
@@ -2558,6 +2609,7 @@ <h3><dfn>Status</dfn></h3>
 
  <li><p>Return <a>success</a> with data <var>body</var>.
 </ol>
+
 </section> <!-- /Status -->
 </section> <!-- /Sessions -->
 
@@ -2721,8 +2773,8 @@ <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
@@ -2747,14 +2799,14 @@ <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>.
+with <var>parameters</var>.
 
 <li><p>
 Make the <a>session timeouts</a> the new <var>timeouts</var>.
@@ -2771,8 +2823,9 @@ <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>'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
@@ -2834,16 +2887,18 @@ <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>,
+<p>When asked to <dfn data-lt="waiting for the navigation to
+ complete">wait for navigation to complete</dfn>, given <var>session</var>,
  run the following steps:
 
 <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>'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>'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>Start a <var>timer</var>. If this algorithm has not
   completed before <var>timer</var> reaches
@@ -2852,15 +2907,15 @@ <h2>Navigation</h2>
   code</a> <a>timeout</a>.
 
  <li><p>If there is an ongoing attempt to <a>navigate</a>
-  the <a>current browsing context</a> that has not
+  <var>session</var>'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>.
+  readiness</a> state associated with the <var>session</var>’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
+ <li><p>Wait for <var>session</var>'s <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
@@ -2886,12 +2941,12 @@ <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>’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>.
 
@@ -2915,43 +2970,47 @@ <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>'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>'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>If <var>session</var>'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>Let <var>url</var> be the result of
-  <a>getting the property</a> <code>url</code>
-  from the <var>parameters</var> argument.
+ <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>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>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>current URL</var> be the <a>current top-level browsing context</a>’s
- <a>active document</a>’s [=Document/URL=].
+ <li><p>Let <var>current URL</var> be <var>session</var>'s <a>current
+ top-level browsing context</a>’s <a>active document</a>’s [=Document/URL=].
 
- <li><p>If <var>current URL</var> and <var>url</var> do not have the same
+ <li><p>If <var>current URL</var> and <var>URL</var> do not have the same
    <a>absolute URL</a>:
 
    <ol>
@@ -2962,9 +3021,10 @@ <h3><dfn>Navigate To</dfn></h3>
        with <a>error code</a> <a>timeout</a>.
    </ol>
 
- <li><p><a>Navigate</a> the <a>current top-level browsing context</a> to <var>url</var>.
+ <li><p><a>Navigate</a> <var>session</var>'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
+ <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>.
@@ -2972,10 +3032,11 @@ <h3><dfn>Navigate To</dfn></h3>
   <li><p><a>Try</a> to run the <a>post-navigation checks</a>.
  </ol>
 
- <li><p><a>Set the current browsing context</a> with the <a>current
-  top-level browsing context</a>.
+ <li><p><a>Set the current browsing context</a>
+  with <var>session</var> and <a>current top-level browsing
+  context</a>.
 
- <li><p>If the <a>current top-level browsing context</a> contains
+ <li><p>If <var>session</var>'s <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
@@ -2999,19 +3060,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>'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
+ <li><p>Let <var>URL</var> be the <a data-lt="URL serializer">serialization</a>
+  of <var>session</var>'s <a>current top-level browsing context</a>’s
   <a>active document</a>’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>
 
@@ -3031,20 +3095,23 @@ <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>'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>'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>Traverse the history by a delta</a> –1
-  for the <a>current browsing context</a>.
+  for <var>session</var>'s <a>current browsing context</a>.
 
  <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=]
@@ -3076,20 +3143,23 @@ <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>'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>'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>Traverse the history by a delta</a> 1
-  for the <a>current browsing context</a>.
+  for <var>session</var>'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> [=fire an event|event fires=]
@@ -3119,29 +3189,34 @@ <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>'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>'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
+ <li><p>Initiate <a>an overridden reload</a>
+   of <var>session</var>&apos;s <a>current top-level browsing
    context</a>’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 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>.
@@ -3163,19 +3238,23 @@ <h3><dfn>Get Title</dfn></h3>
 </table>
 
 <p class=note>This command returns the document title
- of the <a>current top-level browsing context</a>,
+ of <var>session</var>'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>'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 <a>current top-level browsing context</a>’s
-  <a>active document</a>’s {{Document/title}}.
+ <li><p>Let <var>title</var> be
+ the <var>session</var>&apos;s <a>current top-level browsing
+ context</a>’s <a>active document</a>’s {{Document/title}}.
 
  <li><p>Return <a>success</a> with data <var>title</var>.
 </ol>
@@ -3186,13 +3265,13 @@ <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>'s <a>current browsing context</a> or <a>current
+ top-level browsing context</a>.
+ <var>session</var>'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>
@@ -3300,25 +3379,31 @@ <h2>Contexts</h2>
 </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>’s <a>current browsing
+   context</a> to <var>context</var>.
+
+  <li><p>Set the <var>session</var>’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>’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>
@@ -3341,14 +3426,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>'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>'s <a>current top-level browsing context</a>.
 </ol>
 </section> <!-- /Get Window Handle -->
 
@@ -3366,21 +3453,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>'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>'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 -->
 
@@ -3399,17 +3492,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>'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>.
@@ -3419,15 +3513,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>'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>.
@@ -3450,7 +3544,8 @@ <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 <a>List</a>.
@@ -3485,23 +3580,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>'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
@@ -3509,7 +3607,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>'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
@@ -3520,7 +3618,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:
@@ -3554,16 +3652,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>'s <a>current top-level browsing context</a> or
+ a <a>child browsing context</a> of <var>session</var>'s <a>current
+ browsing context</a> to use as <var>session</var>'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,
@@ -3576,15 +3676,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>'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
@@ -3593,15 +3694,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>'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>'s <a>current browsing context</a>’s <a>active document</a>.
 
      <li><p>If <var>id</var> is not
       a <a>supported property index</a> of <var>window</var>,
@@ -3614,35 +3715,36 @@ <h3><dfn>Switch To Frame</dfn></h3>
       (<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>’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>'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 element</a>
-      with <var>id</var>.
+      with <var>session</var> and <var>id</var>.
 
      <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 [=navigable container/content navigable=]'s
-     [=navigable/active browsing context=].
+     with <var>session</var> and <var>element</var>’s [=navigable
+     container/content navigable=]'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>'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>.
@@ -3668,37 +3770,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>'s <a>current browsing context</a> for future <a>commands</a>
+ to the parent of <var>session</var>'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>'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>'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>'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>'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 -->
 
@@ -3707,7 +3815,7 @@ <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>.
+ containing <var>session</var>'s <a>current top-level browsing context</a>.
  Because different operating systems’ 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
@@ -3842,18 +3950,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>'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>'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>'s <a>current top-level browsing
+  context</a>.
+
 </ol>
 </section> <!-- /Get Window Rect -->
 
@@ -3874,25 +3986,26 @@ <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>'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>, else let it be <a><code>null</code></a>.
 
  <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>, else let it be <a><code>null</code></a>.
 
  <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,
+  named "<code>x</code>" from <var>parameters</var>,
   else let it be <a><code>null</code></a>.
 
  <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,
+  named "<code>y</code>" from <var>parameters</var>,
   else let it be <a><code>null</code></a>.
 
  <li><p>If <var>width</var> or <var>height</var> is neither <a><code>null</code></a>
@@ -3905,13 +4018,15 @@ <h4><dfn>Set Window Rect</dfn></h4>
 
  <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,
+  <var>session</var>'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>'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>.
 
@@ -3922,13 +4037,13 @@ <h4><dfn>Set Window Rect</dfn></h4>
   <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>,
+    <var>session</var>'s <a>current top-level browsing context</a>,
     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>,
+   <var>session</var>'s <a>current top-level browsing context</a>,
    including any <a>browser chrome</a> and externally drawn window decorations
    to a value that is as close as possible to <var>height</var>.
 
@@ -3942,8 +4057,9 @@ <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>'s <a>current top-level browsing
+     context</a>’s <a><code>WindowProxy</code></a>’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
@@ -3955,17 +4071,19 @@ <h4><dfn>Set Window Rect</dfn></h4>
  <li><p>If <var>x</var> and <var>y</var> are not <a><code>null</code></a>:
 
   <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.
+   <li><p>Run the implementation-specific steps to set the position of
+    the operating system level window
+    containing <var>session</var>'s <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
+     <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 <var>session</var>'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
@@ -3977,8 +4095,9 @@ <h4><dfn>Set Window Rect</dfn></h4>
    </aside>
   </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>.
+ <li><p>Return <a>success</a> with data set to the <a>WindowRect
+  object</a> for the <var>session</var>'s <a>current top-level browsing
+  context</a>.
 </ol>
 </section> <!-- /Set Window Rect -->
 
@@ -3996,34 +4115,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>'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>'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>'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>'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>'s <a>current top-level browsing
   context</a>.
 </ol>
 </section> <!-- /Maximize Window -->
@@ -4042,30 +4164,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>'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>'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>'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>'s <a>current top-level browsing
   context</a>.
 </ol>
 </section> <!-- /Minimize Window -->
@@ -4084,25 +4209,28 @@ <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>'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
+  with <var>session</var>'s <a>current top-level browsing context</a>’s
   <a>active document</a>’s <a>document element</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>'s <a>current top-level browsing
   context</a>.
 </ol>
 </section> <!-- /Fullscreen Window -->
@@ -4214,16 +4342,17 @@ <h2>Elements</h2>
   return true, otherwise return false.
 </ol>
 
-<p>To <dfn>get a known element</dfn> given <var>reference</var>:
+<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 <a>current session</a>,
-  <a>current browsing context</a>, and <var>reference</var> return
+  <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
-  <a>current session</a>, <a>current browsing context</a>, and
-  <var>reference</var>.
+  <var>session</var>, <var>session</var>&apos;s <a>current browsing
+  context</a>, and <var>reference</var>.
 
   <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>.
@@ -4238,24 +4367,25 @@ <h2>Elements</h2>
 </ol>
 
 <p>To <dfn>get or create a web element reference</dfn>
- given <a><var>element</var></a>:
+ given <var>session</var> and <a><var>element</var></a>:
 
 <ol>
   <li>Assert: <var>element</var> implements {{Element}}.
 
   <li>Return the result of <a>trying</a> to <a>get or create a node
-  reference</a> given <a>current session</a>, <a>current browsing
-  context</a>, and <var>element</var>.
+  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> with <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>.
@@ -4270,13 +4400,12 @@ <h2>Elements</h2>
   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 element</a>
-  with <var>reference</var>.
+  with <var>session</var> and <var>reference</var>.
 
  <li><p>Return <a>success</a> with data <var>element</var>.
 </ol>
@@ -4315,7 +4444,7 @@ <h2>Elements</h2>
  <dt><dfn data-lt="mutable form control element">Mutable form control elements</dfn>
  <dd><p>Denotes [^input^] elements
   that are <a>mutable</a> (e.g. that are not <a>read only</a> or <a>actually disabled</a>)
-  and whose [^input/type^] attribute</a>
+  and whose [^input/type^] attribute
   is in one of the following states:
 
   <ul class=brief>
@@ -4468,8 +4597,8 @@ <h3>Interactability</h3>
 
 <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>'s <a>current browsing context</a>’s
+  <a>active document</a>, return an empty sequence.
 
  <li><p>Let <var>rectangles</var> be
   the {{DOMRect}} sequence
@@ -4507,13 +4636,14 @@ <h3 id=shadow-root>Shadow Roots</h3>
  and <var>reference</var>:
 
  <ol class="algorithm">
-  <li>If not <a>node reference is known</a> with <a>current session</a>,
-  <a>current browsing context</a>, and <var>reference</var> return
+  <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>.
 
   <li>Let <var>node</var> be the result of <a>get a node</a> with
-  <a>current session</a>, <a>current browsing context</a>, and
-  <var>reference</var>.
+  <var>session</var>, <var>session</var>&apos;s <a>current browsing
+  context</a>, and <var>reference</var>.
 
   <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>
@@ -4529,24 +4659,25 @@ <h3 id=shadow-root>Shadow Roots</h3>
 </ol>
 
  <p>To <dfn>get or create a shadow root reference</dfn>
- with <a><var>shadow root</var></a>:
+ given <var>session</var> and <var>shadow root</var>:
 
  <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> given <a>current session</a>, <a>current browsing
-   context</a>, and <var>element</var>.
+   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>.
 
    <li><p>Let <var>reference</var> be the result of <a>get or create a
-    shadow root reference</a> given <var>shadow root</var>.
+    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>.
@@ -4566,7 +4697,7 @@ <h3 id=shadow-root>Shadow Roots</h3>
 
   <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>.
+   with <var>session</var> and <var>reference</var>.
 
   <li><p>Return <a>success</a> with data <var>shadow</var>.
  </ol>
@@ -4591,9 +4722,9 @@ <h3 id=element-retrieval>Retrieval</h3>
  using pre-order traversal of the document’s nodes
  that match the provided selector’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
@@ -4620,8 +4751,8 @@ <h3 id=element-retrieval>Retrieval</h3>
  <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>
@@ -4629,12 +4760,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>'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>
@@ -4835,10 +4966,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>'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
@@ -4851,37 +4982,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>'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>'s <a>current browsing context</a>’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
@@ -4903,35 +5036,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>'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>'s <a>current browsing context</a>’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 -->
@@ -4950,34 +5086,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>'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 element</a>
-  with <a>url variable</a> <var>element id</var>.
+  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>
@@ -5000,33 +5138,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>'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 element</a>
-  with <a>url variable</a> <var>element id</var>.
+  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 -->
@@ -5045,7 +5185,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
@@ -5061,18 +5202,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>
@@ -5095,7 +5236,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
@@ -5111,17 +5253,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 -->
@@ -5140,21 +5282,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>’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>
@@ -5174,18 +5319,19 @@ <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 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>.
 
@@ -5193,7 +5339,7 @@ <h4><dfn>Get Element Shadow Root</dfn></h4>
     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>.
 
@@ -5204,14 +5350,15 @@ <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> +
@@ -5291,17 +5438,20 @@ <h4><dfn>Is Element Selected</dfn></h4>
 of the <a>Checkbox</a>- and <a>Radio Button</a> states,
 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>'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 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:
@@ -5338,18 +5488,22 @@ <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>'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 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>' 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:
 
@@ -5390,18 +5544,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>'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 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>' 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>.
@@ -5427,26 +5585,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>'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 element</a>
-  with <a>url variable</a> <var>element id</var>.
+  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 [=active document=]’s
-   [=Document/type=] 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>’s
+   [=active document=]’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>’s style declarations.
 
    <dt>Otherwise
    <dd> "" (empty string)
@@ -5494,18 +5654,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>'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 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
@@ -5531,17 +5693,20 @@ <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>'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 element</a>
-  with <a>url variable</a> <var>element id</var>.
+  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 {{Element/tagName}} IDL attribute.
@@ -5574,13 +5739,13 @@ <h4><dfn>Get Element Rect</dfn></h4>
 <dt><dfn data-lt="elementrect-x">x</dfn>
 <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>'s <a>current browsing context</a>’s
 <a>document element</a> in <a>CSS pixels</a>.
 
 <dt><dfn data-lt="elementrect-y">y</dfn>
 <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>'s <a>current browsing context</a>’s
 <a>document element</a> in <a>CSS pixels</a>.
 
 <dt><dfn data-lt="elementrect-height">height</dfn>
@@ -5595,20 +5760,23 @@ <h4><dfn>Get Element Rect</dfn></h4>
 </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>'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 element</a>
-  with <a>url variable</a> <var>element id</var>.
+  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
   <a>bounding rectangle</a>.
@@ -5647,23 +5815,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>'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 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 [=active document=]’s
-  [=Document/type=]
-  is not "<code>xml</code>".
+  if <var>session</var>&apos;s <a>current browsing context</a>’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.
@@ -5688,18 +5858,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>'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 element</a>
-        with <a>url variable</a> <var>element id</var>.
+        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>.
 
@@ -5721,21 +5892,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>'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 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>
@@ -5807,16 +5981,20 @@ <h4><dfn>Element Click</dfn></h4>
 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>'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 element</a> with <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 [^input^] element in the <a>file upload state</a>
@@ -5877,8 +6055,9 @@ <h4><dfn>Element Click</dfn></h4>
    <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
@@ -5898,7 +6077,7 @@ <h4><dfn>Element Click</dfn></h4>
       the <var>element</var>’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
@@ -5911,7 +6090,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>
@@ -5929,8 +6108,8 @@ <h4><dfn>Element Click</dfn></h4>
      action</var>».
 
      <li><p><a>Dispatch a list of actions</a> with <var>input
-     state</var>, <var>actions</var>, <a>current browsing
-     context</a>, and <var>actions options</var>.
+     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>.
@@ -6017,17 +6196,20 @@ <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>'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 element</a>
-  with <var>element id</var>.
+  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>.
@@ -6137,8 +6319,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>, <a>current browsing
-   context</a>, and <a>actions options</a>.
+   state</var>, <var>actions</var>, <var>browsing context</var>,
+   and <a>actions options</a>.
   </ol>
 </ol>
 
@@ -6162,7 +6344,7 @@ <h4><dfn>Element Send Keys</dfn></h4>
  <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
@@ -6177,8 +6359,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>
@@ -6193,8 +6374,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>, <a>current browsing
-     context</a>, and <var>actions options</var>.
+     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>
@@ -6211,8 +6392,8 @@ <h4><dfn>Element Send Keys</dfn></h4>
    action</var>, <var>keyup action</var>».
 
    <li><p><a>Dispatch a list of actions</a> with <var>input
-   state</var>, <var>actions</var>, <a>current browsing
-   context</a>, and <var>actions options</var>.
+   state</var>, <var>actions</var>, <var>browsing context</var>,
+   and <var>actions options</var>.
   </ol>
 </ol>
 
@@ -6295,8 +6476,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>, <a>current browsing
-   context</a>, and <var>actions options</var>.
+   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
@@ -6336,35 +6517,38 @@ <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>'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 element</a> with <a>url variable</a> <var>element
-  id</var>.
+  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
    [^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>’s
   <a>strict file interactability</a>, is true run the following substeps:
   <ol>
    <li><p><a>Scroll into view</a> the <var>element</var>.
@@ -6458,9 +6642,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>.
@@ -6473,7 +6658,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>.
@@ -6502,17 +6688,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>'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>'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
@@ -6521,7 +6710,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>'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>.
@@ -6549,11 +6738,10 @@ <h3>Executing Script</h3>
 <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,
@@ -6589,20 +6777,20 @@ <h3>Executing Script</h3>
 
    <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>
@@ -6614,26 +6802,26 @@ <h3>Executing Script</h3>
  <dt>type <a>String</a>
  <dd><p>Return <a>success</a> with data <var>value</var>.
 
- <dt>instance of {{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:
   <ol>
    <li><p>Let <var>reference</var> be the <a>web element reference object</a>
-    for <var>value</var>.
+    for <var>session</var> and <var>value</var>.
 
    <li><p>Return <a>success</a> with data <var>reference</var>.
   </ol>
 
- <dt>instance of {{ShadowRoot}}</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:
   <ol>
    <li><p>Let <var>reference</var> be the <a>shadow root reference object</a>
-    for <var>value</var>.
+    for <var>session</var> and <var>value</var>.
 
     <li><p>Return <a>success</a> with data <var>reference</var>.
   </ol>
@@ -6661,19 +6849,17 @@ <h3>Executing Script</h3>
  <dt>Otherwise
  <dd>
   <ol>
-   <li><p>Let <var>result</var> be the return 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>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>,
@@ -6707,7 +6893,7 @@ <h3>Executing Script</h3>
    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
+   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>,
@@ -6726,22 +6912,20 @@ <h3>Executing Script</h3>
  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>.
@@ -6756,7 +6940,8 @@ <h3>Executing Script</h3>
 
 <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>'s <a>current browsing context</a>’s <a>active
+  document</a>.
 
  <li><p>Let <var>environment settings</var> be
   <var>window</var>’s [=relevant settings object=].
@@ -6830,17 +7015,20 @@ <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>'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>promise</var> be <a>a new Promise</a>.
 
@@ -6861,14 +7049,16 @@ <h4><dfn>Execute Script</dfn></h4>
     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>.
 
-  <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
+  <li><p>Upon fulfillment of <var>promise</var> 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>Upon rejection of <var>promise</var> 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 -->
 
@@ -6893,17 +7083,20 @@ <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>'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>promise</var> be <a>a new Promise</a>.
 
@@ -6951,14 +7144,16 @@ <h4><dfn>Execute Async Script</dfn></h4>
    <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>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
+  <li><p>Upon fulfillment of <var>promise</var> 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>Upon rejection of <var>promise</var> 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 -->
@@ -7034,7 +7229,7 @@ <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
+   Defaults to <var>session</var>'s <a>current browsing context</a>’s
    <a>active document</a>’s <a>URL</a> <a>domain</a>
    if omitted when <a>adding a cookie</a>.
  </tr>
@@ -7111,8 +7306,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>'s <a>current browsing context</a>’s <a>active
+  document</a>, run the substeps of the first matching condition:
 
   <dl class=switch>
    <dt><var>name</var> is <a>undefined</a>
@@ -7139,18 +7334,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>'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 <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>'s <a>current browsing context</a>’s <a>active
+  document</a>:
 
   <ol>
    <li><p>Let <var>serialized cookie</var> be the result
@@ -7177,19 +7376,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>'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>’s <a>cookie name</a> amongst <a>all associated
+  cookies</a> of <var>session</var>'s <a>current browsing
+  context</a>’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>.
@@ -7210,33 +7412,38 @@ <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>'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>'s <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 <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>'s <a>current
+  browsing context</a>’s <a>active document</a>’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
@@ -7253,7 +7460,7 @@ <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
+    otherwise <var>session</var>'s <a>current browsing context</a>’s
     <a>active document</a>’s <a>URL</a> <a>domain</a>.
 
    <dt><a>Cookie secure only</a>
@@ -7293,17 +7500,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>'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>
@@ -7323,13 +7532,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>'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.
 
@@ -7433,15 +7645,16 @@ <h3>Actions Options</h3>
 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> with <a>origin</a>
-and <var>browsing context</var>:,
+<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
-  argument <var>origin</var>.
+  <var>session</var> and <var>origin</var>.
 
   <li><p>Return <a>success</a> with data <var>element</var>.
 </ol>
@@ -7657,7 +7870,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.
 
@@ -7727,7 +7940,7 @@ <h3>Input state</h3>
  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>
 
@@ -7739,7 +7952,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
@@ -7761,22 +7974,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>
@@ -7786,7 +7998,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>].
@@ -7804,7 +8016,7 @@ <h3>Input state</h3>
 
   <li><p>If <var>source</var> is not undefined and <var>source</var>'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
@@ -7861,17 +8073,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
@@ -7996,7 +8208,7 @@ <h3>Processing actions</h3>
    <dd>
     <ol>
      <li><p>Let <var>element</var> be the result of <a>trying</a> to
-     run <var>actions options</var>' <a>get element origin</a>
+     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
@@ -8021,13 +8233,12 @@ <h3>Processing actions</h3>
  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>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>.
+ <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>
@@ -8103,7 +8314,7 @@ <h3>Processing actions</h3>
   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>,
@@ -8165,7 +8376,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>
@@ -8251,10 +8462,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>
@@ -8357,7 +8566,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>
@@ -8378,7 +8587,7 @@ <h3>Processing actions</h3>
 
 <li><p>
 If <var>origin</var> is not equal to "<code>viewport</code>",
-or <var>actions options</var>' <a>is element origin</a> steps given
+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>.
 
@@ -8751,16 +8960,16 @@ <h3>Dispatching actions</h3>
 <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>&aposs <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.
@@ -8770,7 +8979,7 @@ <h3>Dispatching actions</h3>
  actions inner</a> with <var>input state</var>, <var>actions by
  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>.
@@ -8789,7 +8998,7 @@ <h3>Dispatching actions</h3>
     the tick duration</a> with argument <var>tick actions</var>.
 
    <li><p><a>Try</a> to <a>dispatch tick actions</a> with
-   <var>tick actions</var>, <var>tick duration</var>,
+   <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:
@@ -8858,7 +9067,7 @@ <h3>Dispatching actions</h3>
 
    <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
@@ -8905,7 +9114,7 @@ <h3>Dispatching actions</h3>
 </ol>
 
 <p>To <dfn>dispatch a list of actions</dfn> given <var>input
-state</var>, <var>actions</var>, <var>browsing context<var>,
+state</var>, <var>actions</var>, <var>browsing context</var>,
 and <var>actions options</var>:
 
 <aside class=note>
@@ -8921,15 +9130,16 @@ <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>, <a>current browsing
- context</a>, and <var>actions options</var>.
+ state</var>, <var>actions by tick</var>, <var>browsing context</var>,
+ and <var>actions options</var>.
 </ol>
 
 <section>
 <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>,
+<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>,
 <var>browsing context</var>, and <var>actions options</var>:
 
 <ol class="algorithm">
@@ -9200,8 +9410,8 @@ <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
+<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">
@@ -9301,7 +9511,7 @@ <h4>Keyboard actions</h4>
   key repetition.
 </aside>
 
-<p>To <dfn>dispatch a keyUp action</dfn> given,<var>action
+<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>, <var>browsing context</var>,
 and <var>actions options</var>:
@@ -9380,8 +9590,8 @@ <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>, <var>browsing context</var>,
+ <var>action object</var>, <var>input state</var>, <var>global key
+ state</var>, <var>tick duration</var>, <var>browsing context</var>,
  and <var>actions options</var>:
 
 <ol class="algorithm">
@@ -9434,7 +9644,7 @@ <h4>Pointer actions</h4>
  <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>input 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>,
@@ -9485,7 +9695,7 @@ <h4>Pointer actions</h4>
  <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
@@ -9504,8 +9714,8 @@ <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>,
+<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>:
 
@@ -9632,7 +9842,7 @@ <h4>Pointer actions</h4>
 
    <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
@@ -9695,15 +9905,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>,
+<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]].
 
@@ -9715,8 +9925,8 @@ <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>,
+<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>:
 
@@ -9880,12 +10090,14 @@ <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
@@ -9893,17 +10105,17 @@ <h3><dfn>Perform Actions</dfn></h3>
   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>,
+  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>,
+ <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.
@@ -9935,14 +10147,16 @@ <h3><dfn>Release Actions</dfn></h3>
 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>
@@ -9954,11 +10168,13 @@ <h3><dfn>Release Actions</dfn></h3>
  state</var>’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>, <a>current browsing
-  context</a>, and <a>actions options</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>
@@ -9969,11 +10185,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.
@@ -10008,8 +10224,8 @@ <h2>User prompts</h2>
   <td><dfn>Alert</dfn>
   <td><a>window.<code>alert</code></a>
   <td>
-   <a>Accept Alert</a><br />
-   <a>Dismiss Alert</a><br />
+   <a>Accept Alert</a><br>
+   <a>Dismiss Alert</a><br>
    <a>Get Alert Text</a>
  </tr>
 
@@ -10017,8 +10233,8 @@ <h2>User prompts</h2>
   <td><dfn>Confirm</dfn>
   <td><a>window.<code>confirm</code></a>
   <td>
-   <a>Dismiss Alert</a><br />
-   <a>Accept Alert</a><br />
+   <a>Dismiss Alert</a><br>
+   <a>Accept Alert</a><br>
    <a>Get Alert Text</a>
  </tr>
 
@@ -10026,9 +10242,9 @@ <h2>User prompts</h2>
   <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>Dismiss Alert</a><br>
+   <a>Accept Alert</a><br>
+   <a>Get Alert Text</a><br>
    <a>Send Alert Text</a>
  </tr>
 </table>
@@ -10116,8 +10332,8 @@ <h2>User prompts</h2>
    <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>handle any user prompts</dfn>
+ given <var>session</var>, <a>remote end</a> must:
 
 <ol>
 <li><p>
@@ -10126,7 +10342,7 @@ <h2>User prompts</h2>
 
 <li><p>
 Perform the following substeps
-based on the <a>current session</a>’s <a>user prompt handler</a>:
+based on the <a>session</a>’s <a>user prompt handler</a>:
 
 <dl class=switch>
 <dt><a>dismiss state</a>
@@ -10197,11 +10413,13 @@ <h3><dfn>Dismiss Alert</dfn></h3>
 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>,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
@@ -10226,11 +10444,13 @@ <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>'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>,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
@@ -10255,11 +10475,13 @@ <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>'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>,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
@@ -10291,7 +10513,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
@@ -10301,8 +10524,9 @@ <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>'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>,
   return <a>error</a> with <a>error code</a> <a>no such alert</a>.
@@ -10411,14 +10635,14 @@ <h2>Screen capture</h2>
   [=a serialization of the bitmap as a file|a serialization of the `canvas` element’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>
@@ -10437,15 +10661,18 @@ <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>'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
+   <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>’s <a>rectangle</a>.
 
    <li><p>Let <var>screenshot result</var> be the result of <a>trying</a> to call
@@ -10484,17 +10711,20 @@ <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 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>.
@@ -10634,18 +10864,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>'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
@@ -10653,30 +10885,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
@@ -10684,23 +10916,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
@@ -10709,15 +10941,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>
@@ -10726,8 +10958,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>'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

From b70ad7e438bd453a91674126bdd534d7c93e91a6 Mon Sep 17 00:00:00 2001
From: jgraham <james@hoppipolla.co.uk>
Date: Mon, 26 Feb 2024 16:09:00 +0000
Subject: [PATCH 2/2] Update index.html

Co-authored-by: Maksim Sadym <69349599+sadym-chromium@users.noreply.github.com>
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 7899d9fe..86a9bc62 100644
--- a/index.html
+++ b/index.html
@@ -632,7 +632,7 @@ <h3>Routing requests</h3>
  <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 have a valid expansion equal to
-  to <var>URL</var>’s <a>path</a>.
+  <var>URL</var>’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>.