diff --git a/fetch.bs b/fetch.bs
index 98ff55c21..703ef30ce 100644
--- a/fetch.bs
+++ b/fetch.bs
@@ -2846,16 +2846,7 @@ steps:
    <a>connection</a>.
   </ol>
 
- <li>
-  <p>Let <var>proxies</var> be the result of finding proxies for <var>url</var> in an
-  <a>implementation-defined</a> manner. If there are no proxies, let <var>proxies</var> be
-  « "<code>DIRECT</code>" ».
-
-  <p class=note>This is where non-standard technology such as
-  <a href="https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol">Web Proxy Auto-Discovery Protocol (WPAD)</a>
-  and <a href="https://en.wikipedia.org/wiki/Proxy_auto-config">proxy auto-config (PAC)</a> come
-  into play. The "<code>DIRECT</code>" value means to not use a proxy for this particular
-  <var>url</var>.
+ <li><p>Let <var>proxies</var> of calling <a>resolve proxies</a>.
 
  <li><p>Let <var>timingInfo</var> be a new <a for=/>connection timing info</a>.
 
@@ -2912,6 +2903,19 @@ reused across <a>connections</a> whose <a for=connection>credentials</a> are fal
 
 <hr>
 
+<div algorithm>
+<p>To <dfn>resolve proxies</dfn>, return the result of finding proxies for <var>url</var> in an
+<a>implementation-defined</a> manner. If there are no proxies, return « "<code>DIRECT</code>" ».
+
+<p class=note>This is where non-standard technology such as
+<a href="https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol">Web Proxy Auto-Discovery Protocol (WPAD)</a>
+and <a href="https://en.wikipedia.org/wiki/Proxy_auto-config">proxy auto-config (PAC)</a> come
+into play. The "<code>DIRECT</code>" value means to not use a proxy for this particular
+<var>url</var>.
+</div>
+
+<hr>
+
 <div algorithm>
 <p>To <dfn>create a connection</dfn>, given a <a for=/>network partition key</a> <var>key</var>,
 <a for=/>origin</a> <var>origin</var>, boolean <var>credentials</var>, string <var>proxy</var>,
@@ -3023,7 +3027,7 @@ details of reused connections are not exposed and time values are coarsened.
 </div>
 
 
-<h3 id=preemptive-connection-operations>Preemptive connection operations</h3>
+<h3 id=preemptive-connections>Preemptive connections</h3>
 
 <div algorithm="preemmptively-obtain-a-connection">
 <p>To <dfn export>preemptively obtain a connection</dfn>, given an
@@ -3066,13 +3070,11 @@ these steps:
  <li><p><a>Check CSP for preemptive operation</a> with <var>environment</var> and <var>url</var>. If
  that returns <b>blocked</b>, return.
 
- <li><p>Let <var>proxies</var> be the result of finding proxies for <var>url</var> in an
- <a>implementation-defined</a> manner.
+ <li><p>Let <var>proxies</var> be the result of calling <a>resolve proxies</a>.
 
  <li>
-  <p>If <var>proxies</var> is <a for=list>empty</a>, or if <var>proxies</var>
-  <a for=list>contains</a> "<code>DIRECT</code>", then <a>resolve an origin</a> given <var>key</var>
-  and <var>url</var>'s <a for=url>origin</a>.
+  <p>If <var>proxies</var> <a for=list>contains</a> "<code>DIRECT</code>", then
+  <a>resolve an origin</a> given <var>key</var> and <var>url</var>'s <a for=url>origin</a>.
 
   <p class=note>As the results of this algorithm can be cached, future fetches could be faster.
 </ol>
@@ -3090,7 +3092,6 @@ run these steps:
 
  <li><p>Return the result of running <a>should request be blocked by Content Security Policy?</a>
  given <var>request</var>.
-
 </ol>
 </div>
 
@@ -8782,7 +8783,7 @@ to discuss. [[CSP]]
 <a>environment settings object</a> you're operating in. Web-exposed APIs are generally defined with
 Web IDL, for which every object that implements an <a>interface</a> has a
 <a>relevant settings object</a> you can use. For example, a <a for=/>request</a> associated with an
-{{Element}} would set the <a for=/>request</a>'s <a for=request>client</a> to the element's
+<a for=/>element</a> would set the <a for=/>request</a>'s <a for=request>client</a> to the element's
 <a>node document</a>'s <a>relevant settings object</a>. All features that are directly web-exposed
 by JavaScript, HTML, CSS, or other {{Document}} subresources should have a
 <a for=request>client</a>.