diff --git a/dom.bs b/dom.bs
index 198f67278..7e2db7139 100644
--- a/dom.bs
+++ b/dom.bs
@@ -52,7 +52,8 @@ spec:html; type:element
 <p>This specification depends on the Infra Standard. [[!INFRA]]
 
 <p>Some of the terms used in this specification are defined in <cite>Encoding</cite>,
-<cite>Selectors</cite>, <cite>Trusted Types</cite>, <cite>Web IDL</cite>, <cite>XML</cite>, and <cite>Namespaces in XML</cite>.
+<cite>Selectors</cite>, <cite>Trusted Types</cite>, <cite>Web IDL</cite>, <cite>XML</cite>, and
+<cite>Namespaces in XML</cite>.
 [[!ENCODING]]
 [[!SELECTORS4]]
 [[!TRUSTED-TYPES]]
@@ -6358,7 +6359,8 @@ given a <var>document</var>, <var>localName</var>, <var>namespace</var>, and opt
 <ol>
  <li><p>Let <var>oldValue</var> be <var>attribute</var>'s <a for=Attr>value</a>.</p></li>
 
- <li><p><a>Validate and set attribute value</a> <var>value</var> for <var>attribute</var>, with <var>attribute</var>'s <a for=Attr>element</a>.
+ <li><p><a>Validate and set attribute value</a> <var>value</var> for <var>attribute</var>, with
+ <var>attribute</var>'s <a for=Attr>element</a>.
 
  <li><p><a>Handle attribute changes</a> for <var>attribute</var> with <var>attribute</var>'s
  <a for=Attr>element</a>, <var>oldValue</var>, and <var>value</var>.
@@ -6410,13 +6412,17 @@ steps:
  <a for=Attr>value</a>.
 </ol>
 
-<p>To <dfn id=concept-element-attributes-validate-and-set-value>validate and set attribute value</dfn> <var>value</var> for an <a>attribute</a> <var>attribute</var>, with <a>element</a> <var>element</var>, run these steps:
+<p>To <dfn id=concept-element-attributes-validate-and-set-value>validate and set attribute value</dfn>
+<var>value</var> for an <a>attribute</a> <var>attribute</var>, with <a for=/>element</a>
+<var>element</var>, run these steps:
+
+<ol>
+ <li><p>Let <var>validValue</var> be the result of calling
+ <a>Get Trusted Types-compliant attribute value</a> for <var>attribute</var>, with
+ <var>element</var> and <var>value</var>. [[!TRUSTED-TYPES]]
 
- <ol>
- <li><p>Let <var>validValue</var> be the result of calling <a>Get Trusted Types-compliant attribute value</a>
-  for <var>attribute</var>, with <var>element</var> and <var>value</var>.[[!TRUSTED-TYPES]]
  <li><p>Set <var>attribute</var>'s <a for=Attr>value</a> to <var>validValue</var>.
- </ol>
+</ol>
 
 <hr>
 
@@ -6480,7 +6486,8 @@ string <var>namespace</var> (default null):</p>
 
  <li><p>If <var>oldAttr</var> is <var>attr</var>, return <var>attr</var>.
 
- <li><p><a>Validate and set attribute value</a> <var>newAttr</var>'s <a for="Attr">value</a> for <var>newAttr</var> with <var>element</var>.
+ <li><p><a>Validate and set attribute value</a> <var>newAttr</var>'s <a for="Attr">value</a> for
+ <var>newAttr</var> with <var>element</var>.
 
  <li><p>If <var>oldAttr</var> is non-null, then <a lt="replace an attribute">replace</a>
  <var>oldAttr</var> with <var>attr</var>.
@@ -6493,9 +6500,9 @@ string <var>namespace</var> (default null):</p>
 
 <div algorithm>
 <p>To <dfn export id=concept-element-attributes-set-value>set an attribute value</dfn> given an
-<a for=/>element</a> <var>element</var>, a string <var>localName</var>, a string or <a>TrustedType</a> <var>value</var>,
-an optional null or string <var>prefix</var> (default null), and an optional null or string
-<var>namespace</var> (default null):
+<a for=/>element</a> <var>element</var>, a string <var>localName</var>, a string or {{TrustedType}}
+<var>value</var>, an optional null or string <var>prefix</var> (default null), and an optional null
+or string <var>namespace</var> (default null):
 
 <ol>
  <li>Let <var>attribute</var> be the result of
@@ -6512,12 +6519,14 @@ an optional null or string <var>prefix</var> (default null), and an optional nul
  <ol>
   <li><p>Set <var>attribute</var> to a new <a>attribute</a> whose <a for=Attr>namespace</a> is
   <var>namespace</var>, <a for=Attr>namespace prefix</a> is <var>prefix</var>,
-  <a for=Attr>local name</a> is <var>localName</var> and
-  <a for=Node>node document</a> is <var>element</var>'s <a for=Node>node document</a>.
+  <a for=Attr>local name</a> is <var>localName</var> and <a for=Node>node document</a> is
+  <var>element</var>'s <a for=Node>node document</a>.
+
+  <li><p><a>Validate and set attribute value</a> <var>value</var> for <var>attribute</var> with
+  <var>element</var>.
 
-  <li><p><a>Validate and set attribute value</a> <var>value</var> for <var>attribute</var> with <var>element</var>.
+  <li><p><a lt="append an attribute">Append</a> <var>attribute</var> to <var>element</var>.
 
-  <li><p><a lt="append an attribute">Append</a> <var>attribute</var> to <var>element</var>
   <li><p>Return.
  </ol>
 
@@ -6783,13 +6792,19 @@ method steps are:
  <!-- This is step 2 of "get an attribute by name", modified as appropriate -->
 
  <li><p>If <var>attribute</var> is null, then:
-   <ol>
-     <li><p>Set <var>attribute</var> to a new <a>attribute</a> whose
-       <a for=Attr>local name</a> is <var>qualifiedName</var> and <a for=Node>node document</a> is <a>this</a>'s <a for=Node>node document</a>.
-     <li><p><a>Validate and set attribute value</a> <var>value</var> for <var>attribute</var>, with <a>this</a>.
-     <li><a lt="append an attribute">Append</a> <var>attribute</var> to <a>this</a>.
-     <li><p>Return.
-   </ol>
+
+ <ol>
+  <li><p>Set <var>attribute</var> to a new <a>attribute</a> whose <a for=Attr>local name</a> is
+  <var>qualifiedName</var> and <a for=Node>node document</a> is <a>this</a>'s
+  <a for=Node>node document</a>.
+
+  <li><p><a>Validate and set attribute value</a> <var>value</var> for <var>attribute</var>,
+  with <a>this</a>.
+
+  <li><p><a lt="append an attribute">Append</a> <var>attribute</var> to <a>this</a>.
+
+  <li><p>Return.
+ </ol>
 
  <li><p><a lt="change an attribute">Change</a> <var>attribute</var> to <var>value</var>.
 </ol>