diff --git a/tree-construction/blocks.dat b/tree-construction/blocks.dat
index 5d3871e..a1a9c75 100644
--- a/tree-construction/blocks.dat
+++ b/tree-construction/blocks.dat
@@ -2,7 +2,6 @@
 <!doctype html><p>foo<address>bar<p>baz
 #errors
 (1,39): expected-closing-tag-but-got-eof
-30: Unclosed element “address”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -32,7 +31,6 @@
 <!doctype html><p>foo<article>bar<p>baz
 #errors
 (1,39): expected-closing-tag-but-got-eof
-30: Unclosed element “article”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -62,7 +60,6 @@
 <!doctype html><p>foo<aside>bar<p>baz
 #errors
 (1,37): expected-closing-tag-but-got-eof
-28: Unclosed element “aside”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -92,7 +89,6 @@
 <!doctype html><p>foo<blockquote>bar<p>baz
 #errors
 (1,42): expected-closing-tag-but-got-eof
-33: Unclosed element “blockquote”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -122,7 +118,6 @@
 <!doctype html><p>foo<center>bar<p>baz
 #errors
 (1,38): expected-closing-tag-but-got-eof
-29: Unclosed element “center”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -152,7 +147,6 @@
 <!doctype html><p>foo<details>bar<p>baz
 #errors
 (1,39): expected-closing-tag-but-got-eof
-30: Unclosed element “details”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -182,7 +176,6 @@
 <!doctype html><p>foo<dialog>bar<p>baz
 #errors
 (1,38): expected-closing-tag-but-got-eof
-29: Unclosed element “dialog”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -212,7 +205,6 @@
 <!doctype html><p>foo<dir>bar<p>baz
 #errors
 (1,35): expected-closing-tag-but-got-eof
-26: Unclosed element “dir”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -242,7 +234,6 @@
 <!doctype html><p>foo<div>bar<p>baz
 #errors
 (1,35): expected-closing-tag-but-got-eof
-26: Unclosed element “div”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -272,7 +263,6 @@
 <!doctype html><p>foo<dl>bar<p>baz
 #errors
 (1,34): expected-closing-tag-but-got-eof
-25: Unclosed element “dl”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -302,7 +292,6 @@
 <!doctype html><p>foo<fieldset>bar<p>baz
 #errors
 (1,40): expected-closing-tag-but-got-eof
-31: Unclosed element “fieldset”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -332,7 +321,6 @@
 <!doctype html><p>foo<figcaption>bar<p>baz
 #errors
 (1,42): expected-closing-tag-but-got-eof
-33: Unclosed element “figcaption”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -362,7 +350,6 @@
 <!doctype html><p>foo<figure>bar<p>baz
 #errors
 (1,38): expected-closing-tag-but-got-eof
-29: Unclosed element “figure”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -392,7 +379,6 @@
 <!doctype html><p>foo<footer>bar<p>baz
 #errors
 (1,38): expected-closing-tag-but-got-eof
-29: Unclosed element “footer”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -422,7 +408,6 @@
 <!doctype html><p>foo<header>bar<p>baz
 #errors
 (1,38): expected-closing-tag-but-got-eof
-29: Unclosed element “header”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -452,7 +437,6 @@
 <!doctype html><p>foo<hgroup>bar<p>baz
 #errors
 (1,38): expected-closing-tag-but-got-eof
-29: Unclosed element “hgroup”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -482,7 +466,6 @@
 <!doctype html><p>foo<listing>bar<p>baz
 #errors
 (1,39): expected-closing-tag-but-got-eof
-30: Unclosed element “listing”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -512,7 +495,6 @@
 <!doctype html><p>foo<menu>bar<p>baz
 #errors
 (1,36): expected-closing-tag-but-got-eof
-27: Unclosed element “menu”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -542,7 +524,6 @@
 <!doctype html><p>foo<nav>bar<p>baz
 #errors
 (1,35): expected-closing-tag-but-got-eof
-26: Unclosed element “nav”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -572,7 +553,6 @@
 <!doctype html><p>foo<ol>bar<p>baz
 #errors
 (1,34): expected-closing-tag-but-got-eof
-25: Unclosed element “ol”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -602,7 +582,6 @@
 <!doctype html><p>foo<pre>bar<p>baz
 #errors
 (1,35): expected-closing-tag-but-got-eof
-26: Unclosed element “pre”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -632,7 +611,6 @@
 <!doctype html><p>foo<section>bar<p>baz
 #errors
 (1,39): expected-closing-tag-but-got-eof
-30: Unclosed element “section”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -662,7 +640,6 @@
 <!doctype html><p>foo<summary>bar<p>baz
 #errors
 (1,39): expected-closing-tag-but-got-eof
-30: Unclosed element “summary”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -692,7 +669,6 @@
 <!doctype html><p>foo<ul>bar<p>baz
 #errors
 (1,34): expected-closing-tag-but-got-eof
-25: Unclosed element “ul”.
 #document
 | <!DOCTYPE html>
 | <html>
diff --git a/tree-construction/comments01.dat b/tree-construction/comments01.dat
index fa79c2b..4b9ff95 100644
--- a/tree-construction/comments01.dat
+++ b/tree-construction/comments01.dat
@@ -29,8 +29,9 @@ FOO<!-- BAR --!>BAZ
 FOO<!-- BAR --! >BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
+(1:21) eof-in-comment
 #new-errors
-(1:20) eof-in-comment
+(1:21) eof-in-comment
 #document
 | <html>
 |   <head>
@@ -43,8 +44,9 @@ FOO<!-- BAR --!
 >BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
+(2:5) eof-in-comment
 #new-errors
-(1:20) eof-in-comment
+(2:5) eof-in-comment
 #document
 | <html>
 |   <head>
@@ -57,7 +59,6 @@ FOO<!-- BAR --!
 FOO<!-- BAR --   >BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
-(1,15): unexpected-char-in-comment
 (1,21): eof-in-comment
 #new-errors
 (1:22) eof-in-comment
@@ -72,8 +73,6 @@ FOO<!-- BAR --   >BAZ
 FOO<!-- BAR -- <QUX> -- MUX -->BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
-(1,15): unexpected-char-in-comment
-(1,24): unexpected-char-in-comment
 #document
 | <html>
 |   <head>
@@ -86,8 +85,6 @@ FOO<!-- BAR -- <QUX> -- MUX -->BAZ
 FOO<!-- BAR -- <QUX> -- MUX --!>BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
-(1,15): unexpected-char-in-comment
-(1,24): unexpected-char-in-comment
 (1,31): unexpected-bang-after-double-dash-in-comment
 #new-errors
 (1:32) incorrectly-closed-comment
@@ -103,9 +100,6 @@ FOO<!-- BAR -- <QUX> -- MUX --!>BAZ
 FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
-(1,15): unexpected-char-in-comment
-(1,24): unexpected-char-in-comment
-(1,31): unexpected-char-in-comment
 (1,35): eof-in-comment
 #new-errors
 (1:36) eof-in-comment
@@ -202,7 +196,6 @@ FOO<!-->BAZ
 FOO<!----->BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
-(1,10): unexpected-dash-after-double-dash-in-comment
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/doctype01.dat b/tree-construction/doctype01.dat
index c845bec..9efdaf7 100644
--- a/tree-construction/doctype01.dat
+++ b/tree-construction/doctype01.dat
@@ -34,7 +34,6 @@
 #data
 <!DOCTYPE>Hello
 #errors
-(1,9): need-space-after-doctype
 (1,10): expected-doctype-name-but-got-right-bracket
 (1,10): unknown-doctype
 #new-errors
@@ -337,6 +336,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
    "http://www.w3.org/TR/html4/strict.dtd">Hello
 #errors
+(2,43): unknown-doctype
 #document
 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 | <html>
@@ -421,6 +421,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
 #errors
 (1,50): unexpected-char-in-doctype
+(1,89): unknown-doctype
 #new-errors
 (1:50) missing-whitespace-between-doctype-public-and-system-identifiers
 #document
@@ -433,6 +434,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
 #errors
 (1,50): unexpected-char-in-doctype
+(1,89): unknown-doctype
 #new-errors
 (1:50) missing-whitespace-between-doctype-public-and-system-identifiers
 #document
@@ -446,6 +448,7 @@
 #errors
 (1,21): unexpected-char-in-doctype
 (1,49): unexpected-char-in-doctype
+(1,88): unknown-doctype
 #new-errors
 (1:22) missing-whitespace-after-doctype-public-keyword
 (1:49) missing-whitespace-between-doctype-public-and-system-identifiers
@@ -460,6 +463,7 @@
 #errors
 (1,21): unexpected-char-in-doctype
 (1,49): unexpected-char-in-doctype
+(1,88): unknown-doctype
 #new-errors
 (1:22) missing-whitespace-after-doctype-public-keyword
 (1:49) missing-whitespace-between-doctype-public-and-system-identifiers
diff --git a/tree-construction/entities02.dat b/tree-construction/entities02.dat
index 0c6e898..74965a3 100644
--- a/tree-construction/entities02.dat
+++ b/tree-construction/entities02.dat
@@ -45,7 +45,6 @@
 #data
 <div bar="ZZ&gt=YY"></div>
 #errors
-(1,15): named-entity-without-semicolon
 (1,20): expected-doctype-but-got-start-tag
 #document
 | <html>
@@ -204,7 +203,6 @@
 #data
 <div bar="ZZ&pound=23"></div>
 #errors
-(1,18): named-entity-without-semicolon
 (1,23): expected-doctype-but-got-start-tag
 #document
 | <html>
@@ -299,6 +297,8 @@
 #data
 <div>ZZ&AElig=</div>
 #errors
+(1,5): expected-doctype-but-got-start-tag
+(1:14) missing-semicolon-after-character-reference
 #new-errors
 (1:14) missing-semicolon-after-character-reference
 #document
diff --git a/tree-construction/foreign-fragment.dat b/tree-construction/foreign-fragment.dat
index d5bc22e..448d9c8 100644
--- a/tree-construction/foreign-fragment.dat
+++ b/tree-construction/foreign-fragment.dat
@@ -3,7 +3,6 @@
 #errors
 6: HTML start tag “nobr” in a foreign namespace context.
 7: End of file seen and there were open elements.
-6: Unclosed element “nobr”.
 #document-fragment
 svg path
 #document
@@ -35,7 +34,6 @@ svg path
 #errors
 10: End tag “path” did not match the name of the current open element (“g”).
 11: End of file seen and there were open elements.
-3: Unclosed element “g”.
 #document-fragment
 svg path
 #document
@@ -173,7 +171,6 @@ math ms
 #errors
 51: Self-closing syntax (“/>”) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
 52: End of file seen and there were open elements.
-51: Unclosed element “ms”.
 #new-errors
 (1:44-1:49) non-void-html-element-start-tag-with-trailing-solidus
 #document-fragment
@@ -216,7 +213,6 @@ math ms
 #errors
 51: Self-closing syntax (“/>”) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
 52: End of file seen and there were open elements.
-51: Unclosed element “mn”.
 #new-errors
 (1:44-1:49) non-void-html-element-start-tag-with-trailing-solidus
 #document-fragment
@@ -259,7 +255,6 @@ math mn
 #errors
 51: Self-closing syntax (“/>”) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
 52: End of file seen and there were open elements.
-51: Unclosed element “mo”.
 #new-errors
 (1:44-1:49) non-void-html-element-start-tag-with-trailing-solidus
 #document-fragment
@@ -302,7 +297,6 @@ math mo
 #errors
 51: Self-closing syntax (“/>”) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
 52: End of file seen and there were open elements.
-51: Unclosed element “mi”.
 #new-errors
 (1:44-1:49) non-void-html-element-start-tag-with-trailing-solidus
 #document-fragment
@@ -345,7 +339,6 @@ math mi
 #errors
 51: Self-closing syntax (“/>”) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
 52: End of file seen and there were open elements.
-51: Unclosed element “mtext”.
 #new-errors
 (1:44-1:52) non-void-html-element-start-tag-with-trailing-solidus
 #document-fragment
@@ -580,6 +573,8 @@ svg svg
 <svg></p><foo>
 #errors
 9: HTML end tag “p” in a foreign namespace context.
+(1:6) Unexpected </p> from in body insertion mode
+(1:15) Unexpected EOF
 #document-fragment
 div
 #document
@@ -591,6 +586,8 @@ div
 <svg></br><foo>
 #errors
 10: HTML end tag “br” in a foreign namespace context.
+(1:6) Unexpected </br> from in body insertion mode
+(1:16) Unexpected EOF
 #document-fragment
 div
 #document
@@ -602,6 +599,8 @@ div
 </p><foo>
 #errors
 4: HTML end tag “p” in a foreign namespace context.
+(1:1) Unexpected </p> from in body insertion mode
+(1:10) Unexpected EOF
 #document-fragment
 svg svg
 #document
@@ -612,6 +611,8 @@ svg svg
 </br><foo>
 #errors
 5: HTML end tag “br” in a foreign namespace context.
+(1:1) Unexpected </br> from in body insertion mode
+(1:11) Unexpected EOF
 #document-fragment
 svg svg
 #document
@@ -622,6 +623,8 @@ svg svg
 <body><foo>
 #errors
 6: HTML start tag “body” in a foreign namespace context.
+(1:1) Unexpected <body> from in body insertion mode
+(1:12) Unexpected EOF
 #document-fragment
 svg svg
 #document
@@ -631,6 +634,7 @@ svg svg
 <p><foo>
 #errors
 3: HTML start tag “p” in a foreign namespace context.
+(1:9) Unexpected EOF
 #document-fragment
 svg svg
 #document
@@ -641,6 +645,7 @@ svg svg
 <p></p><foo>
 #errors
 3: HTML start tag “p” in a foreign namespace context.
+(1:13) Unexpected EOF
 #document-fragment
 svg svg
 #document
diff --git a/tree-construction/html5test-com.dat b/tree-construction/html5test-com.dat
index f738010..48d0bf9 100644
--- a/tree-construction/html5test-com.dat
+++ b/tree-construction/html5test-com.dat
@@ -142,7 +142,6 @@
 #data
 <!--foo--bar-->
 #errors
-(1,10): unexpected-char-in-comment
 (1,15): expected-doctype-but-got-eof
 #document
 | <!-- foo--bar -->
diff --git a/tree-construction/math.dat b/tree-construction/math.dat
index ae9cd7c..d6a8ae5 100644
--- a/tree-construction/math.dat
+++ b/tree-construction/math.dat
@@ -1,6 +1,8 @@
 #data
 <math><tr><td><mo><tr>
 #errors
+(1,22): unexpected-start-tag
+(1,23): expected-closing-tag-but-got-eof
 #document-fragment
 td
 #document
@@ -12,6 +14,9 @@ td
 #data
 <math><tr><td><mo><tr>
 #errors
+(1,6): foster-parenting-start-tag
+(1,22): expected-tr-in-table-scope
+(1,23): expected-closing-tag-but-got-eof
 #document-fragment
 tr
 #document
@@ -23,6 +28,9 @@ tr
 #data
 <math><thead><mo><tbody>
 #errors
+(1,6): foster-parenting-start-tag
+(1,24): expected-table-part-in-table-scope
+(1,25): expected-closing-tag-but-got-eof
 #document-fragment
 thead
 #document
@@ -33,6 +41,9 @@ thead
 #data
 <math><tfoot><mo><tbody>
 #errors
+(1,6): foster-parenting-start-tag
+(1,24): expected-table-part-in-table-scope
+(1,25): expected-closing-tag-but-got-eof
 #document-fragment
 tfoot
 #document
@@ -43,6 +54,9 @@ tfoot
 #data
 <math><tbody><mo><tfoot>
 #errors
+(1,6): foster-parenting-start-tag
+(1,24): expected-table-part-in-table-scope
+(1,25): expected-closing-tag-but-got-eof
 #document-fragment
 tbody
 #document
@@ -53,6 +67,9 @@ tbody
 #data
 <math><tbody><mo></table>
 #errors
+(1,6): foster-parenting-start-tag
+(1,25): unexpected-end-tag-in-math
+(1,26): expected-closing-tag-but-got-eof
 #document-fragment
 tbody
 #document
@@ -63,6 +80,9 @@ tbody
 #data
 <math><thead><mo></table>
 #errors
+(1,6): foster-parenting-start-tag
+(1,25): unexpected-end-tag-in-math
+(1,26): expected-closing-tag-but-got-eof
 #document-fragment
 tbody
 #document
@@ -73,6 +93,9 @@ tbody
 #data
 <math><tfoot><mo></table>
 #errors
+(1,6): foster-parenting-start-tag
+(1,25): unexpected-end-tag-in-math
+(1,26): expected-closing-tag-but-got-eof
 #document-fragment
 tbody
 #document
diff --git a/tree-construction/menuitem-element.dat b/tree-construction/menuitem-element.dat
index 43aa0c6..fb13c3c 100644
--- a/tree-construction/menuitem-element.dat
+++ b/tree-construction/menuitem-element.dat
@@ -3,7 +3,6 @@
 #errors
 10: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
 10: End of file seen and there were open elements.
-10: Unclosed element “menuitem”.
 #document
 | <html>
 |   <head>
@@ -24,7 +23,6 @@
 <!DOCTYPE html><body><menuitem>A
 #errors
 32: End of file seen and there were open elements.
-31: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -37,8 +35,6 @@
 <!DOCTYPE html><body><menuitem>A<menuitem>B
 #errors
 43: End of file seen and there were open elements.
-42: Unclosed element “menuitem”.
-31: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -53,7 +49,6 @@
 <!DOCTYPE html><body><menuitem>A<menu>B</menu>
 #errors
 46: End of file seen and there were open elements.
-31: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -68,7 +63,6 @@
 <!DOCTYPE html><body><menuitem>A<hr>B
 #errors
 37: End of file seen and there were open elements.
-31: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -83,7 +77,6 @@
 <!DOCTYPE html><li><menuitem><li>
 #errors
 33: End tag “li” implied, but there were open elements.
-29: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -98,7 +91,6 @@
 #errors
 39: Stray end tag “menuitem”.
 40: End of file seen and there were open elements.
-25: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -112,9 +104,7 @@
 <!DOCTYPE html><p><b></p><menuitem>
 #errors
 25: End tag “p” seen, but there were open elements.
-21: Unclosed element “b”.
 35: End of file seen and there were open elements.
-35: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -129,7 +119,6 @@
 <!DOCTYPE html><menuitem><asdf></menuitem>x
 #errors
 42: End tag “menuitem” seen, but there were open elements.
-31: Unclosed element “asdf”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -184,7 +173,6 @@
 <!DOCTYPE html><option><menuitem>
 #errors
 33: End of file seen and there were open elements.
-33: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -197,7 +185,6 @@
 <!DOCTYPE html><menuitem><option>
 #errors
 33: End of file seen and there were open elements.
-25: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -210,7 +197,6 @@
 <!DOCTYPE html><menuitem></body>
 #errors
 32: End tag for  “body” seen, but there were unclosed elements.
-25: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -222,7 +208,6 @@
 <!DOCTYPE html><menuitem></html>
 #errors
 32: End tag for  “html” seen, but there were unclosed elements.
-25: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -234,7 +219,6 @@
 <!DOCTYPE html><menuitem><p>
 #errors
 28: End of file seen and there were open elements.
-25: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -247,7 +231,6 @@
 <!DOCTYPE html><menuitem><li>
 #errors
 29: End of file seen and there were open elements.
-25: Unclosed element “menuitem”.
 #document
 | <!DOCTYPE html>
 | <html>
diff --git a/tree-construction/namespace-sensitivity.dat b/tree-construction/namespace-sensitivity.dat
index ca35c0e..050dca7 100644
--- a/tree-construction/namespace-sensitivity.dat
+++ b/tree-construction/namespace-sensitivity.dat
@@ -1,6 +1,12 @@
 #data
 <body><table><tr><td><svg><td><foreignObject><span></td>Foo
 #errors
+(1,6): expected-doctype-but-got-start-tag
+(1,56): unexpected-end-tag
+(1,60): foster-parenting-character
+(1,60): foster-parenting-character
+(1,60): foster-parenting-character
+(1,60): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/plain-text-unsafe.dat b/tree-construction/plain-text-unsafe.dat
index dfb5cb6..e904eff 100644
Binary files a/tree-construction/plain-text-unsafe.dat and b/tree-construction/plain-text-unsafe.dat differ
diff --git a/tree-construction/ruby.dat b/tree-construction/ruby.dat
index 696782f..f4e5e4e 100644
--- a/tree-construction/ruby.dat
+++ b/tree-construction/ruby.dat
@@ -203,6 +203,7 @@
 <html><ruby>a<rtc>b<span></ruby></html>
 #errors
 (1,6): expected-doctype-but-got-start-tag
+(1,32): unexpected-end-tag
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/svg.dat b/tree-construction/svg.dat
index 8e9a2bb..a452e7a 100644
--- a/tree-construction/svg.dat
+++ b/tree-construction/svg.dat
@@ -1,6 +1,8 @@
 #data
 <svg><tr><td><title><tr>
 #errors
+(1:21) Unexpected <tr> tag
+(1:25) Unexpected EOF
 #document-fragment
 td
 #document
@@ -12,6 +14,9 @@ td
 #data
 <svg><tr><td><title><tr>
 #errors
+(1:1) Unexpected <svg> tag
+(1:21) Unexpected <tr> tag
+(1:25) Unexpected EOF
 #document-fragment
 tr
 #document
@@ -23,6 +28,9 @@ tr
 #data
 <svg><thead><title><tbody>
 #errors
+(1:1) Unexpected <svg> tag
+(1:20) Unexpected <tbody> tag
+(1:27) Unexpected EOF
 #document-fragment
 thead
 #document
@@ -33,6 +41,9 @@ thead
 #data
 <svg><tfoot><title><tbody>
 #errors
+(1:1) Unexpected <svg> tag
+(1:20) Unexpected <tbody> tag
+(1:27) Unexpected EOF
 #document-fragment
 tfoot
 #document
@@ -43,6 +54,9 @@ tfoot
 #data
 <svg><tbody><title><tfoot>
 #errors
+(1:1) Unexpected <svg> tag
+(1:20) Unexpected <tfoot> tag
+(1:27) Unexpected EOF
 #document-fragment
 tbody
 #document
@@ -53,6 +67,9 @@ tbody
 #data
 <svg><tbody><title></table>
 #errors
+(1:1) Unexpected <svg> tag
+(1:20) Unexpected </table> tag
+(1:28) Unexpected EOF
 #document-fragment
 tbody
 #document
@@ -63,6 +80,9 @@ tbody
 #data
 <svg><thead><title></table>
 #errors
+(1:1) Unexpected <svg> tag
+(1:20) Unexpected </table> tag
+(1:28) Unexpected EOF
 #document-fragment
 tbody
 #document
@@ -73,6 +93,9 @@ tbody
 #data
 <svg><tfoot><title></table>
 #errors
+(1:1) Unexpected <svg> tag
+(1:20) Unexpected </table> tag
+(1:28) Unexpected EOF
 #document-fragment
 tbody
 #document
diff --git a/tree-construction/template.dat b/tree-construction/template.dat
index b38d4f5..2d97183 100644
--- a/tree-construction/template.dat
+++ b/tree-construction/template.dat
@@ -1089,7 +1089,11 @@ eof in template
 <body><template><col>Hello
 #errors
 no doctype
-unexpected text
+(1,27): foster-parenting-character
+(1,27): foster-parenting-character
+(1,27): foster-parenting-character
+(1,27): foster-parenting-character
+(1,27): foster-parenting-character
 eof in template
 #document
 | <html>
@@ -1593,6 +1597,11 @@ eof table
 #data
 <template><a><table><a>
 #errors
+(1,10): expected-doctype-but-got-start-tag
+(1,23): foster-parenting-start-tag
+(1,23): unexpected-start-tag
+(1,23): formatting-element-not-in-scope
+(1,24): eof-in-template
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/tests1.dat b/tree-construction/tests1.dat
index 1c36c1b..86632de 100644
--- a/tree-construction/tests1.dat
+++ b/tree-construction/tests1.dat
@@ -425,7 +425,6 @@ Line1<br>Line2<br>Line3<br>Line4
 #data
 <!-----><font><div>hello<table>excite!<b>me!<th><i>please!</tr><!--X-->
 #errors
-(1,7): unexpected-dash-after-double-dash-in-comment
 (1,14): expected-doctype-but-got-start-tag
 (1,41): unexpected-start-tag-implies-table-voodoo
 (1,48): foster-parenting-character-in-table
diff --git a/tree-construction/tests16.dat b/tree-construction/tests16.dat
index cea7340..05f34c1 100644
--- a/tree-construction/tests16.dat
+++ b/tree-construction/tests16.dat
@@ -221,7 +221,6 @@
 <!doctype html><script><!
 #errors
 (1,25): expected-script-data-but-got-eof
-(1,25): expected-named-closing-tag-but-got-eof
 #document
 | <!DOCTYPE html>
 | <html>
@@ -1525,7 +1524,6 @@
 #errors
 (1,8): expected-doctype-but-got-start-tag
 (1,10): expected-script-data-but-got-eof
-(1,10): expected-named-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/tests18.dat b/tree-construction/tests18.dat
index 05363b3..0b6d5dc 100644
--- a/tree-construction/tests18.dat
+++ b/tree-construction/tests18.dat
@@ -3,7 +3,6 @@
 #errors
 11: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
 23: End of file seen and there were open elements.
-11: Unclosed element “plaintext”.
 #document
 | <html>
 |   <head>
@@ -27,7 +26,6 @@
 <!doctype html><html><plaintext></plaintext>
 #errors
 44: End of file seen and there were open elements.
-32: Unclosed element “plaintext”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -40,7 +38,6 @@
 <!doctype html><head><plaintext></plaintext>
 #errors
 44: End of file seen and there were open elements.
-32: Unclosed element “plaintext”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -54,7 +51,6 @@
 #errors
 42: Bad start tag in “plaintext” in “head”.
 54: End of file seen and there were open elements.
-42: Unclosed element “plaintext”.
 #script-off
 #document
 | <!DOCTYPE html>
@@ -69,7 +65,6 @@
 <!doctype html></head><plaintext></plaintext>
 #errors
 45: End of file seen and there were open elements.
-33: Unclosed element “plaintext”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -82,7 +77,6 @@
 <!doctype html><body><plaintext></plaintext>
 #errors
 44: End of file seen and there were open elements.
-32: Unclosed element “plaintext”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -95,8 +89,19 @@
 <!doctype html><table><plaintext></plaintext>
 #errors
 (1,33): foster-parenting-start-tag
-(1,45): foster-parenting-character
-(1,45): eof-in-table
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): foster-parenting-character
+(1,46): eof-in-table
 #document
 | <!DOCTYPE html>
 | <html>
@@ -110,8 +115,19 @@
 <!doctype html><table><tbody><plaintext></plaintext>
 #errors
 (1,40): foster-parenting-start-tag
-(1,41): foster-parenting-character
-(1,52): eof-in-table
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): foster-parenting-character
+(1,53): eof-in-table
 #document
 | <!DOCTYPE html>
 | <html>
@@ -126,8 +142,19 @@
 <!doctype html><table><tbody><tr><plaintext></plaintext>
 #errors
 (1,44): foster-parenting-start-tag
-(1,56): foster-parenting-character
-(1,56): eof-in-table
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): foster-parenting-character
+(1,57): eof-in-table
 #document
 | <!DOCTYPE html>
 | <html>
@@ -173,11 +200,20 @@
 #data
 <!doctype html><table><colgroup><plaintext></plaintext>
 #errors
-43: Start tag “plaintext” seen in “table”.
-55: Misplaced non-space characters inside a table.
+(1,43): foster-parenting-start-tag
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
+(1,56): foster-parenting-character
 55: End of file seen and there were open elements.
-43: Unclosed element “plaintext”.
-22: Unclosed element “table”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -194,7 +230,6 @@
 34: Stray start tag “plaintext”.
 46: Stray end tag “plaintext”.
 47: End of file seen and there were open elements.
-23: Unclosed element “select”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -210,8 +245,6 @@
 41: Stray start tag “plaintext”.
 51: “caption” start tag with “select” open.
 52: End of file seen and there were open elements.
-51: Unclosed element “caption”.
-22: Unclosed element “table”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -227,8 +260,6 @@
 <!doctype html><template><plaintext>a</template>b
 #errors
 49: End of file seen and there were open elements.
-36: Unclosed element “plaintext”.
-25: Unclosed element “template”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -244,7 +275,6 @@
 #errors
 39: Stray start tag “plaintext”.
 51: End of file seen and there were open elements.
-39: Unclosed element “plaintext”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -259,7 +289,6 @@
 36: Stray start tag “plaintext”.
 48: Stray end tag “plaintext”.
 48: End of file seen and there were open elements.
-25: Unclosed element “frameset”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -282,7 +311,6 @@
 #errors
 46: Stray start tag “plaintext”.
 58: End of file seen and there were open elements.
-46: Unclosed element “plaintext”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -306,7 +334,6 @@
 <!doctype html><svg><plaintext>a</plaintext>b
 #errors
 45: End of file seen and there were open elements.
-20: Unclosed element “svg”.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -321,9 +348,6 @@
 <!doctype html><svg><title><plaintext>a</plaintext>b
 #errors
 52: End of file seen and there were open elements.
-38: Unclosed element “plaintext”.
-27: Unclosed element “title”.
-20: Unclosed element “svg”.
 #document
 | <!DOCTYPE html>
 | <html>
diff --git a/tree-construction/tests19.dat b/tree-construction/tests19.dat
index a189777..2e06fb3 100644
--- a/tree-construction/tests19.dat
+++ b/tree-construction/tests19.dat
@@ -1015,7 +1015,6 @@
 <!doctype html><p><math></p>a
 #errors
 (1,28): unexpected-end-tag
-(1,28): unexpected-end-tag
 #document
 | <!DOCTYPE html>
 | <html>
diff --git a/tree-construction/tests20.dat b/tree-construction/tests20.dat
index afdae74..1bfd130 100644
--- a/tree-construction/tests20.dat
+++ b/tree-construction/tests20.dat
@@ -557,6 +557,7 @@
 <math><annotation-xml></svg>x
 #errors
 (1,6): expected-doctype-but-got-start-tag
+(1,28): unexpected-end-tag-in-math
 (1,28): unexpected-end-tag
 (1,29): expected-closing-tag-but-got-eof
 #document
diff --git a/tree-construction/tests21.dat b/tree-construction/tests21.dat
index 1e2af7c..d52ab8c 100644
--- a/tree-construction/tests21.dat
+++ b/tree-construction/tests21.dat
@@ -41,6 +41,7 @@
 <svg><![CDATA[foo
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:18) eof-in-cdata
 (1,17): expected-closing-tag-but-got-eof
 #new-errors
 (1:18) eof-in-cdata
@@ -55,6 +56,7 @@
 <svg><![CDATA[foo
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:18) eof-in-cdata
 (1,17): expected-closing-tag-but-got-eof
 #new-errors
 (1:18) eof-in-cdata
@@ -69,6 +71,7 @@
 <svg><![CDATA[
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:15) eof-in-cdata
 (1,14): expected-closing-tag-but-got-eof
 #new-errors
 (1:15) eof-in-cdata
@@ -117,6 +120,7 @@
 <svg><![CDATA[]]
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:17) eof-in-cdata
 (1,16): expected-closing-tag-but-got-eof
 #new-errors
 (1:17) eof-in-cdata
@@ -131,6 +135,7 @@
 <svg><![CDATA[]
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:16) eof-in-cdata
 (1,15): expected-closing-tag-but-got-eof
 #new-errors
 (1:16) eof-in-cdata
@@ -145,6 +150,7 @@
 <svg><![CDATA[]>a
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:16) eof-in-cdata
 (1,17): expected-closing-tag-but-got-eof
 #new-errors
 (1:18) eof-in-cdata
@@ -236,6 +242,7 @@
 <svg><![CDATA[<svg>a
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:21) eof-in-cdata
 (1,20): expected-closing-tag-but-got-eof
 #new-errors
 (1:21) eof-in-cdata
@@ -250,6 +257,7 @@
 <svg><![CDATA[</svg>a
 #errors
 (1,5): expected-doctype-but-got-start-tag
+(1:22) eof-in-cdata
 (1,21): expected-closing-tag-but-got-eof
 #new-errors
 (1:22) eof-in-cdata
diff --git a/tree-construction/tests26.dat b/tree-construction/tests26.dat
index e6f71f6..1ba2be2 100644
--- a/tree-construction/tests26.dat
+++ b/tree-construction/tests26.dat
@@ -395,7 +395,10 @@ Line 1 Col 19 Expected closing tag. Unexpected end of file.
 #data
 <svg></p><foo>
 #errors
+(1:1) Missing doctype
 9: HTML end tag “p” in a foreign namespace context.
+(1:6) Unexpected </p> from in body insertion mode
+(1:16) Unexpected EOF
 #document
 | <html>
 |   <head>
@@ -407,7 +410,10 @@ Line 1 Col 19 Expected closing tag. Unexpected end of file.
 #data
 <svg></br><foo>
 #errors
+(1:1) Missing doctype
 10: HTML end tag “br” in a foreign namespace context.
+(1:6) Unexpected </br> from in body insertion mode
+(1:16) Unexpected EOF
 #document
 | <html>
 |   <head>
@@ -419,7 +425,10 @@ Line 1 Col 19 Expected closing tag. Unexpected end of file.
 #data
 <math></p><foo>
 #errors
+(1:1) Missing doctype
 10: HTML end tag “p” in a foreign namespace context.
+(1:7) Unexpected </p> from in body insertion mode
+(1:16) Unexpected EOF
 #document
 | <html>
 |   <head>
@@ -431,7 +440,10 @@ Line 1 Col 19 Expected closing tag. Unexpected end of file.
 #data
 <math></br><foo>
 #errors
+(1:1) Missing doctype
 11: HTML end tag “br” in a foreign namespace context.
+(1:7) Unexpected </br> from in body insertion mode
+(1:17) Unexpected EOF
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/tests6.dat b/tree-construction/tests6.dat
index f399123..8c36dd3 100644
--- a/tree-construction/tests6.dat
+++ b/tree-construction/tests6.dat
@@ -48,7 +48,6 @@
 #data
 <!doctype>
 #errors
-(1,9): need-space-after-doctype
 (1,10): expected-doctype-name-but-got-right-bracket
 (1,10): unknown-doctype
 #new-errors
@@ -604,6 +603,7 @@ html
 #data
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html></html>
 #errors
+(1,50): doctype-has-public-identifier
 #document
 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "">
 | <html>
diff --git a/tree-construction/tests7.dat b/tree-construction/tests7.dat
index 395dc72..8c5596b 100644
--- a/tree-construction/tests7.dat
+++ b/tree-construction/tests7.dat
@@ -391,7 +391,6 @@ A<table><tr> B</tr> </em>C</table>
 (1,1): expected-doctype-but-got-chars
 (1,13): foster-parenting-character
 (1,14): foster-parenting-character
-(1,20): foster-parenting-character
 (1,25): unexpected-end-tag
 (1,25): unexpected-end-tag-in-special-element
 (1,26): foster-parenting-character
diff --git a/tree-construction/tests8.dat b/tree-construction/tests8.dat
index ba2e63d..d532801 100644
--- a/tree-construction/tests8.dat
+++ b/tree-construction/tests8.dat
@@ -90,6 +90,9 @@ x"
 #data
 <table><li><li></table>
 #errors
+(1,7): expected-doctype-but-got-start-tag
+(1,11): foster-parenting-start-tag
+(1,15): foster-parenting-start-tag
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/webkit01.dat b/tree-construction/webkit01.dat
index 2127cfe..3bb3bb9 100644
--- a/tree-construction/webkit01.dat
+++ b/tree-construction/webkit01.dat
@@ -687,6 +687,10 @@ console.log("FOO<span>BAR</span>BAZ");
 #data
 <table><tr><td><svg><desc><td></desc><circle>
 #errors
+(1,7): expected-doctype-but-got-start-tag
+(1,30): unexpected-start-tag
+(1,37): unexpected-end-tag
+(1,22): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/webkit02.dat b/tree-construction/webkit02.dat
index 791991d..dddfe2a 100644
--- a/tree-construction/webkit02.dat
+++ b/tree-construction/webkit02.dat
@@ -138,6 +138,7 @@
 #data
 <legend>test</legend>
 #errors
+(1,7): expected-doctype-but-got-start-tag
 #document
 | <html>
 |   <head>
@@ -148,6 +149,9 @@
 #data
 <table><input>
 #errors
+(1,7): expected-doctype-but-got-start-tag
+(1,14): foster-parenting-start-tag
+(1,15): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
@@ -158,6 +162,9 @@
 #data
 <b><em><foo><foo><aside></b>
 #errors
+(1,3): expected-doctype-but-got-start-tag
+(1,28): adoption-agency-9
+(1,29): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
@@ -173,6 +180,10 @@
 #data
 <b><em><foo><foo><aside></b></em>
 #errors
+(1,3): expected-doctype-but-got-start-tag
+(1,28): adoption-agency-9
+(1,33): adoption-agency-9
+(1,34): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
@@ -189,6 +200,9 @@
 #data
 <b><em><foo><foo><foo><aside></b>
 #errors
+(1,3): expected-doctype-but-got-start-tag
+(1,33): adoption-agency-9
+(1,34): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
@@ -204,6 +218,10 @@
 #data
 <b><em><foo><foo><foo><aside></b></em>
 #errors
+(1,3): expected-doctype-but-got-start-tag
+(1,33): adoption-agency-9
+(1,38): adoption-agency-9
+(1,39): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
@@ -219,6 +237,9 @@
 #data
 <b><em><foo><foo><foo><foo><foo><foo><foo><foo><foo><foo><aside></b></em>
 #errors
+(1,68): adoption-agency-9
+(1,73): adoption-agency-9
+(1,74): expected-closing-tag-but-got-eof
 #document-fragment
 div
 #document
@@ -240,6 +261,9 @@ div
 #data
 <b><em><foo><foob><foob><foob><foob><fooc><fooc><fooc><fooc><food><aside></b></em>
 #errors
+(1,77): adoption-agency-9
+(1,82): adoption-agency-9
+(1,83): expected-closing-tag-but-got-eof
 #document-fragment
 div
 #document
@@ -261,6 +285,8 @@ div
 #data
 <option><XH<optgroup></optgroup>
 #errors
+(1,21): unexpected-start-tag-in-select
+(1,32): unexpected-end-tag-in-select
 #document-fragment
 select
 #document
@@ -269,6 +295,8 @@ select
 #data
 <svg><foreignObject><div>foo</div><plaintext></foreignObject></svg><div>bar</div>
 #errors
+(1,5): expected-doctype-but-got-start-tag
+(1,82): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
@@ -283,6 +311,8 @@ select
 #data
 <svg><foreignObject></foreignObject><title></svg>foo
 #errors
+(1,5): expected-doctype-but-got-start-tag
+(1,49): expected-one-end-tag-but-got-another
 #document
 | <html>
 |   <head>
@@ -295,6 +325,9 @@ select
 #data
 </foreignObject><plaintext><div>foo</div>
 #errors
+(1,16): expected-doctype-but-got-end-tag
+(1,16): unexpected-end-tag-before-html
+(1,42): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
