diff --git a/source b/source
index 291c45fff57..29541bd8cab 100644
--- a/source
+++ b/source
@@ -37872,9 +37872,10 @@ interface <dfn interface>HTMLMediaElement</dfn> : <span>HTMLElement</span> {
   </p>
 
   <p>A <span>media resource</span> has an associated
-  <dfn data-x="media-resource-origin">origin</dfn>, which is either "<code data-x="">none</code>",
-  "<code data-x="">multiple</code>", "<code data-x="">rewritten</code>", or an
-  <span>origin</span>. It is initially set to "<code data-x="">none</code>".</p>
+  <dfn data-x="media-resource-origin" for="media resource">origin</dfn>, which is either
+  "<code data-x="">none</code>", "<code data-x="">multiple</code>",
+  "<code data-x="">rewritten</code>", or an <span>origin</span>. It is initially set to
+  "<code data-x="">none</code>".</p>
 
   <p>A <span>media resource</span> can have multiple audio and video tracks. For the purposes of a
   <span>media element</span>, the video data of the <span>media resource</span> is only that of the
@@ -37892,7 +37893,8 @@ interface <dfn interface>HTMLMediaElement</dfn> : <span>HTMLElement</span> {
 
   <div w-nodev>
 
-  <p>Each <span>media element</span> has a unique <dfn>media element event task source</dfn>.</p>
+  <p>Each <span>media element</span> has a unique <dfn for="media element">media element event task
+  source</dfn>.</p>
 
   <div algorithm>
   <p>To <dfn export>queue a media element task</dfn> with a <span>media element</span>
@@ -93928,21 +93930,24 @@ interface <dfn interface data-x="dom-Origin-interface">Origin</dfn> {
   <span>struct</span> with the following <span data-x="struct item">items</span>:</p>
 
   <ul>
-   <li><p>A boolean <dfn data-x="coop-enforcement-bcg-switch">needs a browsing context group
-   switch</dfn>, initially false.</p></li>
+   <li><p>A boolean <dfn data-x="coop-enforcement-bcg-switch" for="opener policy enforcement
+    result">needs a browsing context group switch</dfn>, initially false.</p></li>
 
-   <li><p>A boolean <dfn data-x="coop-enforcement-bcg-switch-report-only">would need a browsing
-   context group switch due to report-only</dfn>, initially false.</p></li>
+   <li><p>A boolean <dfn data-x="coop-enforcement-bcg-switch-report-only" for="opener policy
+   enforcement result">would need a browsing context group switch due to report-only</dfn>,
+   initially false.</p></li>
 
-   <li><p>A <span>URL</span> <dfn data-x="coop-enforcement-url">url</dfn>.</p></li>
+   <li><p>A <span>URL</span> <dfn data-x="coop-enforcement-url" for="opener policy enforcement
+   result">url</dfn>.</p></li>
 
-   <li><p>An <span>origin</span> <dfn data-x="coop-enforcement-origin">origin</dfn>.</p></li>
+   <li><p>An <span>origin</span> <dfn data-x="coop-enforcement-origin" for="opener policy
+   enforcement result">origin</dfn>.</p></li>
 
-   <li><p>An <span>opener policy</span> <dfn data-x="coop-enforcement-coop">opener
-   policy</dfn>.</p></li>
+   <li><p>An <span>opener policy</span> <dfn data-x="coop-enforcement-coop" for="opener policy
+   enforcement result">opener policy</dfn>.</p></li>
 
-   <li><p>A boolean <dfn data-x="coop-enforcement-source">current context is navigation
-   source</dfn>, initially false.</p></li>
+   <li><p>A boolean <dfn data-x="coop-enforcement-source" for="opener policy enforcement
+   result">current context is navigation source</dfn>, initially false.</p></li>
   </ul>
 
   <div algorithm>
@@ -106313,8 +106318,8 @@ interface <dfn interface>NotRestoredReasons</dfn> {
 
   <ul>
    <li>
-    <p>A <dfn data-x="document-state-document">document</dfn>, a <code>Document</code> or null,
-    initially null.</p>
+    <p>A <dfn data-x="document-state-document" for="document state">document</dfn>, a
+    <code>Document</code> or null, initially null.</p>
 
     <div class="note" id="note-bfcache">
      <p>When a history entry is <span data-x="nav-active-history-entry">active</span>, it has a
@@ -106336,16 +106341,18 @@ interface <dfn interface>NotRestoredReasons</dfn> {
     </div>
    </li>
 
-   <li><p id="she-policy-container">A <dfn data-x="document-state-history-policy-container">history
-   policy container</dfn>, a <span>policy container</span> or null, initially null.</p></li>
+   <li><p id="she-policy-container">A <dfn data-x="document-state-history-policy-container"
+   for="document state">history policy container</dfn>, a <span>policy container</span> or
+   null, initially null.</p></li>
 
-   <li><p>A <dfn data-x="document-state-request-referrer">request referrer</dfn>, which is "<code
-   data-x="">no-referrer</code>", "<code data-x="">client</code>", or a <span>URL</span>, initially
-   "<code data-x="">client</code>".</p></li>
+   <li><p>A <dfn data-x="document-state-request-referrer" for="document state">request
+   referrer</dfn>, which is "<code data-x="">no-referrer</code>", "<code data-x="">client</code>",
+   or a <span>URL</span>, initially "<code data-x="">client</code>".</p></li>
 
    <li>
-    <p>A <dfn data-x="document-state-request-referrer-policy">request referrer policy</dfn>, which
-    is a <span>referrer policy</span>, initially the <span>default referrer policy</span>.</p>
+    <p>A <dfn data-x="document-state-request-referrer-policy" for="document state">request
+    referrer policy</dfn>, which is a <span>referrer policy</span>, initially the <span>default
+    referrer policy</span>.</p>
 
     <p class="note">The <span data-x="document-state-request-referrer-policy">request referrer
     policy</span> is distinct from the <span
@@ -106356,13 +106363,13 @@ interface <dfn interface>NotRestoredReasons</dfn> {
    </li>
 
    <li>
-    <p>An <dfn data-x="document-state-initiator-origin">initiator origin</dfn>, which is an
-    <span>origin</span> or null, initially null.</p>
+    <p>An <dfn data-x="document-state-initiator-origin" for="document state">initiator origin</dfn>,
+    which is an <span>origin</span> or null, initially null.</p>
    </li>
 
    <li>
-    <p>An <dfn data-x="document-state-origin">origin</dfn>, which is an <span>origin</span> or
-    null, initially null.</p>
+    <p>An <dfn data-x="document-state-origin" for="document state">origin</dfn>, which is an
+    <span>origin</span> or null, initially null.</p>
 
     <p class="note">This is the origin that we set "<code data-x="">about:</code>"-schemed
     <code>Document</code>s' <span data-x="concept-document-origin">origin</span> to. We store it
@@ -106374,8 +106381,8 @@ interface <dfn interface>NotRestoredReasons</dfn> {
    </li>
 
    <li>
-    <p>An <dfn data-x="document-state-about-base-url">about base URL</dfn>, which is a
-    <span>URL</span> or null, initially null.</p>
+    <p>An <dfn data-x="document-state-about-base-url" for="document state">about base URL</dfn>,
+    which is a <span>URL</span> or null, initially null.</p>
 
     <p class="note">This will be populated only for "<code data-x="">about:</code>"-schemed
     <code>Document</code>s and will be the <span>fallback base URL</span> for those
@@ -106383,30 +106390,31 @@ interface <dfn interface>NotRestoredReasons</dfn> {
     base URL</span>.</p>
    </li>
 
-   <li><p><dfn data-x="document-state-nested-histories">Nested histories</dfn>, a <span>list</span>
-   of <span data-x="nested history">nested histories</span>, initially an empty
+   <li><p><dfn data-x="document-state-nested-histories" for="document state">Nested histories</dfn>,
+   a <span>list</span> of <span data-x="nested history">nested histories</span>, initially an empty
    <span>list</span>.</p></li>
 
    <li>
-    <p>A <dfn data-x="document-state-resource">resource</dfn>, a string, <span>POST resource</span>
-    or null, initially null.</p>
+    <p>A <dfn data-x="document-state-resource" for="document state">resource</dfn>, a string,
+    <span>POST resource</span> or null, initially null.</p>
 
     <p class="note">A string is treated as HTML. It's used to store the source of an <span
     data-x="an iframe srcdoc document"><code>iframe</code> <code
     data-x="attr-iframe-srcdoc">srcdoc</code> document</span>.</p>
    </li>
 
-   <li><p>A <dfn data-x="document-state-reload-pending">reload pending</dfn> boolean, initially
-   false.</p></li>
+   <li><p>A <dfn data-x="document-state-reload-pending" for="document state">reload pending</dfn>
+   boolean, initially false.</p></li>
 
-   <li><p>An <dfn data-x="document-state-ever-populated">ever populated</dfn> boolean, initially
-   false.</p></li>
+   <li><p>An <dfn data-x="document-state-ever-populated" for="document state">ever populated</dfn>
+   boolean, initially false.</p></li>
 
-   <li><p id="she-bc-name">A <dfn data-x="document-state-nav-target-name">navigable target
-   name</dfn> string, initially the empty string.</p></li>
+   <li><p id="she-bc-name">A <dfn data-x="document-state-nav-target-name" for="document
+   state">navigable target name</dfn> string, initially the empty string.</p></li>
 
-   <li><p>A <dfn data-x="document-state-not-restored-reasons">not restored reasons</dfn>, a
-   <span data-x="nrr-struct">not restored reasons</span> or null, initially null.</p></li>
+   <li><p>A <dfn data-x="document-state-not-restored-reasons" for="document state">not restored
+   reasons</dfn>, a <span data-x="nrr-struct">not restored reasons</span> or null, initially
+   null.</p></li>
   </ul>
 
   <p>User agents may <span>destroy a document and its descendants</span> given the <span
@@ -114768,8 +114776,8 @@ new PaymentRequest(&hellip;); // Allowed to use
   IP anonymization policy</span>.</p>
 
   <p>A <dfn>cross-origin prefetch IP anonymization policy</dfn> is a <span>struct</span> whose
-  single <span data-x="struct item">item</span> is its <dfn data-x="copiap-origin">origin</dfn>, an
-  <span>origin</span>.</p>
+  single <span data-x="struct item">item</span> is its <dfn data-x="copiap-origin"
+  for="cross-origin prefetch IP anonymization policy">origin</dfn>, an <span>origin</span>.</p>
 
   <hr>