diff --git a/source b/source
index 92d5204d008..ca31ae9c991 100644
--- a/source
+++ b/source
@@ -99262,7 +99262,8 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
    be filled in before it is emitted.)</dd>
 
    <dt>U+003F QUESTION MARK (?)</dt>
-   <dd><span>Parse error</span>. Switch to the <span>bogus comment state</span>.</dd>
+   <dd><span>Parse error</span>. Create a comment token whose data is the empty string. Switch to
+   the <span>bogus comment state</span>. Reconsume the <span>current input character</span>.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Switch to the <span>data state</span>. Emit a U+003C LESS-THAN SIGN
@@ -99295,7 +99296,8 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
    character token and a U+002F SOLIDUS character token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
-   <dd><span>Parse error</span>. Switch to the <span>bogus comment state</span>.</dd>
+   <dd><span>Parse error</span>. Create a comment token whose data is the empty string. Switch to
+   the <span>bogus comment state</span>. Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -100363,21 +100365,25 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
 
 
   <h5><dfn>Bogus comment state</dfn></h5>
+  
+  <p>Consume the <span>next input character</span>:</p>
 
-  <p>Consume every character up to and including the first U+003E GREATER-THAN SIGN character (&gt;)
-  or the end of the file (EOF), whichever comes first.
-  If more than one character was consumed, then emit a comment token whose data is the
-  concatenation of all the characters starting from and including the character that caused the
-  state machine to switch into the bogus comment state, up to and including the character
-  immediately before the last consumed character (i.e. up to the character just before the U+003E or
-  EOF character), but with any U+0000 NULL characters replaced by U+FFFD REPLACEMENT CHARACTER
-  characters. (If the comment was started by the end of the file (EOF), the token is empty.
-  Similarly, the token is empty if it was generated by the string "<code
-  data-x="">&lt;!></code>".)</p>
+  <dl class="switch">
 
-  <p>Switch to the <span>data state</span>.</p>
+   <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
+   <dd>Switch to the <span>data state</span>. Emit the comment token.</dd>
 
-  <p>If the end of the file was reached, reconsume the EOF character.</p>
+   <dt>EOF</dt>
+   <dd>Switch to the <span>data state</span>. Reconsume the EOF character. Emit the comment
+   token.</dd>
+   
+   <dt>U+0000 NULL</dt>
+   <dd>Append a U+FFFD REPLACEMENT CHARACTER character to the comment token's data.</dd>
+
+   <dt>Anything else</dt>
+   <dd>Append the <span>current input character</span> to the comment token's data.</dd>
+
+  </dl>
 
 
   <h5><dfn>Markup declaration open state</dfn></h5>
@@ -100396,9 +100402,9 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
   character before and after), then consume those characters and switch to the <span>CDATA section
   state</span>.</p>
 
-  <p>Otherwise, this is a <span>parse error</span>. Switch to the <span>bogus comment state</span>.
-  The next character that is consumed, if any, is the first character that will be in the
-  comment.</p>
+  <p>Otherwise, this is a <span>parse error</span>. Create a comment token whose data is the empty
+  string. Switch to the <span>bogus comment state</span> (don't consume anything in the current
+  state).</p>
 
 
   <h5><dfn>Comment start state</dfn></h5>
@@ -117549,6 +117555,7 @@ INSERT INTERFACES HERE
   Ido Green,
   Ignacio Javier,
   Igor Oliveira,
+  Ingvar Stepanyan,
   Iurii Kucherov,
   Ivan Enderlin,
   Ivo Emanuel Gon&ccedil;alves,