diff --git a/blaze-html.cabal b/blaze-html.cabal
--- a/blaze-html.cabal
+++ b/blaze-html.cabal
@@ -1,5 +1,5 @@
 Name:         blaze-html
-Version:      0.8.1.3
+Version:      0.9.0.0
 Homepage:     http://jaspervdj.be/blaze
 Bug-Reports:  http://github.com/jaspervdj/blaze-html/issues
 License:      BSD3
@@ -53,7 +53,7 @@
   Build-depends:
     base          >= 4    && < 5,
     blaze-builder >= 0.3  && < 0.5,
-    blaze-markup  >= 0.7  && < 0.8,
+    blaze-markup  >= 0.8  && < 0.9,
     bytestring    >= 0.9  && < 0.11,
     text          >= 0.10 && < 1.3
 
@@ -78,7 +78,7 @@
     -- Copied from regular dependencies...
     base          >= 4    && < 5,
     blaze-builder >= 0.3  && < 0.5,
-    blaze-markup  >= 0.7  && < 0.8,
+    blaze-markup  >= 0.8  && < 0.9,
     bytestring    >= 0.9  && < 0.11,
     text          >= 0.10 && < 1.3
 
diff --git a/src/Text/Blaze/Html4/FrameSet.hs b/src/Text/Blaze/Html4/FrameSet.hs
--- a/src/Text/Blaze/Html4/FrameSet.hs
+++ b/src/Text/Blaze/Html4/FrameSet.hs
@@ -252,7 +252,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" ">"
+area = Leaf "area" "<area" ">" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -287,7 +287,7 @@
 -- > <basefont />
 --
 basefont :: Html  -- ^ Resulting HTML.
-basefont = Leaf "basefont" "<basefont" ">"
+basefont = Leaf "basefont" "<basefont" ">" ()
 {-# INLINE basefont #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -376,7 +376,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" ">"
+br = Leaf "br" "<br" ">" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -483,7 +483,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" ">"
+col = Leaf "col" "<col" ">" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -716,7 +716,7 @@
 -- > <frame />
 --
 frame :: Html  -- ^ Resulting HTML.
-frame = Leaf "frame" "<frame" ">"
+frame = Leaf "frame" "<frame" ">" ()
 {-# INLINE frame #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -877,7 +877,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" ">"
+hr = Leaf "hr" "<hr" ">" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -948,7 +948,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" ">"
+img = Leaf "img" "<img" ">" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -965,7 +965,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" ">"
+input = Leaf "input" "<input" ">" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1090,7 +1090,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" ">"
+link = Leaf "link" "<link" ">" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1143,7 +1143,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" ">"
+meta = Leaf "meta" "<meta" ">" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1286,7 +1286,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" ">"
+param = Leaf "param" "<param" ">" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
diff --git a/src/Text/Blaze/Html4/Strict.hs b/src/Text/Blaze/Html4/Strict.hs
--- a/src/Text/Blaze/Html4/Strict.hs
+++ b/src/Text/Blaze/Html4/Strict.hs
@@ -221,7 +221,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" ">"
+area = Leaf "area" "<area" ">" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -328,7 +328,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" ">"
+br = Leaf "br" "<br" ">" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -417,7 +417,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" ">"
+col = Leaf "col" "<col" ">" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -740,7 +740,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" ">"
+hr = Leaf "hr" "<hr" ">" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -793,7 +793,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" ">"
+img = Leaf "img" "<img" ">" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -810,7 +810,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" ">"
+input = Leaf "input" "<input" ">" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -917,7 +917,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" ">"
+link = Leaf "link" "<link" ">" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -952,7 +952,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" ">"
+meta = Leaf "meta" "<meta" ">" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1077,7 +1077,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" ">"
+param = Leaf "param" "<param" ">" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
diff --git a/src/Text/Blaze/Html4/Transitional.hs b/src/Text/Blaze/Html4/Transitional.hs
--- a/src/Text/Blaze/Html4/Transitional.hs
+++ b/src/Text/Blaze/Html4/Transitional.hs
@@ -250,7 +250,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" ">"
+area = Leaf "area" "<area" ">" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -285,7 +285,7 @@
 -- > <basefont />
 --
 basefont :: Html  -- ^ Resulting HTML.
-basefont = Leaf "basefont" "<basefont" ">"
+basefont = Leaf "basefont" "<basefont" ">" ()
 {-# INLINE basefont #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -374,7 +374,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" ">"
+br = Leaf "br" "<br" ">" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -481,7 +481,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" ">"
+col = Leaf "col" "<col" ">" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -840,7 +840,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" ">"
+hr = Leaf "hr" "<hr" ">" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -911,7 +911,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" ">"
+img = Leaf "img" "<img" ">" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -928,7 +928,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" ">"
+input = Leaf "input" "<input" ">" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1053,7 +1053,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" ">"
+link = Leaf "link" "<link" ">" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1106,7 +1106,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" ">"
+meta = Leaf "meta" "<meta" ">" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1249,7 +1249,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" ">"
+param = Leaf "param" "<param" ">" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
diff --git a/src/Text/Blaze/Html5.hs b/src/Text/Blaze/Html5.hs
--- a/src/Text/Blaze/Html5.hs
+++ b/src/Text/Blaze/Html5.hs
@@ -232,7 +232,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" ">"
+area = Leaf "area" "<area" ">" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -321,7 +321,7 @@
 -- > <base />
 --
 base :: Html  -- ^ Resulting HTML.
-base = Leaf "base" "<base" ">"
+base = Leaf "base" "<base" ">" ()
 {-# INLINE base #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -392,7 +392,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" ">"
+br = Leaf "br" "<br" ">" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -499,7 +499,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" ">"
+col = Leaf "col" "<col" ">" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -714,7 +714,7 @@
 -- > <embed />
 --
 embed :: Html  -- ^ Resulting HTML.
-embed = Leaf "embed" "<embed" ">"
+embed = Leaf "embed" "<embed" ">" ()
 {-# INLINE embed #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -983,7 +983,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" ">"
+hr = Leaf "hr" "<hr" ">" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1054,7 +1054,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" ">"
+img = Leaf "img" "<img" ">" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1071,7 +1071,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" ">"
+input = Leaf "input" "<input" ">" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1124,7 +1124,7 @@
 -- > <keygen />
 --
 keygen :: Html  -- ^ Resulting HTML.
-keygen = Leaf "keygen" "<keygen" ">"
+keygen = Leaf "keygen" "<keygen" ">" ()
 {-# INLINE keygen #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1195,7 +1195,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" ">"
+link = Leaf "link" "<link" ">" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1284,7 +1284,7 @@
 -- > <menuitem />
 --
 menuitem :: Html  -- ^ Resulting HTML.
-menuitem = Leaf "menuitem" "<menuitem" ">"
+menuitem = Leaf "menuitem" "<menuitem" ">" ()
 {-# INLINE menuitem #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1301,7 +1301,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" ">"
+meta = Leaf "meta" "<meta" ">" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1480,7 +1480,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" ">"
+param = Leaf "param" "<param" ">" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1695,7 +1695,7 @@
 -- > <source />
 --
 source :: Html  -- ^ Resulting HTML.
-source = Leaf "source" "<source" ">"
+source = Leaf "source" "<source" ">" ()
 {-# INLINE source #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -2000,7 +2000,7 @@
 -- > <track />
 --
 track :: Html  -- ^ Resulting HTML.
-track = Leaf "track" "<track" ">"
+track = Leaf "track" "<track" ">" ()
 {-# INLINE track #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -2071,5 +2071,5 @@
 -- > <wbr />
 --
 wbr :: Html  -- ^ Resulting HTML.
-wbr = Leaf "wbr" "<wbr" ">"
+wbr = Leaf "wbr" "<wbr" ">" ()
 {-# INLINE wbr #-}
diff --git a/src/Text/Blaze/XHtml1/FrameSet.hs b/src/Text/Blaze/XHtml1/FrameSet.hs
--- a/src/Text/Blaze/XHtml1/FrameSet.hs
+++ b/src/Text/Blaze/XHtml1/FrameSet.hs
@@ -252,7 +252,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" " />"
+area = Leaf "area" "<area" " />" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -287,7 +287,7 @@
 -- > <basefont />
 --
 basefont :: Html  -- ^ Resulting HTML.
-basefont = Leaf "basefont" "<basefont" " />"
+basefont = Leaf "basefont" "<basefont" " />" ()
 {-# INLINE basefont #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -376,7 +376,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" " />"
+br = Leaf "br" "<br" " />" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -483,7 +483,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" " />"
+col = Leaf "col" "<col" " />" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -716,7 +716,7 @@
 -- > <frame />
 --
 frame :: Html  -- ^ Resulting HTML.
-frame = Leaf "frame" "<frame" " />"
+frame = Leaf "frame" "<frame" " />" ()
 {-# INLINE frame #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -877,7 +877,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" " />"
+hr = Leaf "hr" "<hr" " />" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -948,7 +948,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" " />"
+img = Leaf "img" "<img" " />" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -965,7 +965,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" " />"
+input = Leaf "input" "<input" " />" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1090,7 +1090,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" " />"
+link = Leaf "link" "<link" " />" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1143,7 +1143,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" " />"
+meta = Leaf "meta" "<meta" " />" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1286,7 +1286,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" " />"
+param = Leaf "param" "<param" " />" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
diff --git a/src/Text/Blaze/XHtml1/Strict.hs b/src/Text/Blaze/XHtml1/Strict.hs
--- a/src/Text/Blaze/XHtml1/Strict.hs
+++ b/src/Text/Blaze/XHtml1/Strict.hs
@@ -221,7 +221,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" " />"
+area = Leaf "area" "<area" " />" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -328,7 +328,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" " />"
+br = Leaf "br" "<br" " />" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -417,7 +417,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" " />"
+col = Leaf "col" "<col" " />" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -740,7 +740,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" " />"
+hr = Leaf "hr" "<hr" " />" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -793,7 +793,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" " />"
+img = Leaf "img" "<img" " />" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -810,7 +810,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" " />"
+input = Leaf "input" "<input" " />" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -917,7 +917,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" " />"
+link = Leaf "link" "<link" " />" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -952,7 +952,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" " />"
+meta = Leaf "meta" "<meta" " />" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1077,7 +1077,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" " />"
+param = Leaf "param" "<param" " />" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
diff --git a/src/Text/Blaze/XHtml1/Transitional.hs b/src/Text/Blaze/XHtml1/Transitional.hs
--- a/src/Text/Blaze/XHtml1/Transitional.hs
+++ b/src/Text/Blaze/XHtml1/Transitional.hs
@@ -250,7 +250,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" " />"
+area = Leaf "area" "<area" " />" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -285,7 +285,7 @@
 -- > <basefont />
 --
 basefont :: Html  -- ^ Resulting HTML.
-basefont = Leaf "basefont" "<basefont" " />"
+basefont = Leaf "basefont" "<basefont" " />" ()
 {-# INLINE basefont #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -374,7 +374,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" " />"
+br = Leaf "br" "<br" " />" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -481,7 +481,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" " />"
+col = Leaf "col" "<col" " />" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -840,7 +840,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" " />"
+hr = Leaf "hr" "<hr" " />" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -911,7 +911,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" " />"
+img = Leaf "img" "<img" " />" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -928,7 +928,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" " />"
+input = Leaf "input" "<input" " />" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1053,7 +1053,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" " />"
+link = Leaf "link" "<link" " />" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1106,7 +1106,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" " />"
+meta = Leaf "meta" "<meta" " />" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1249,7 +1249,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" " />"
+param = Leaf "param" "<param" " />" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
diff --git a/src/Text/Blaze/XHtml5.hs b/src/Text/Blaze/XHtml5.hs
--- a/src/Text/Blaze/XHtml5.hs
+++ b/src/Text/Blaze/XHtml5.hs
@@ -232,7 +232,7 @@
 -- > <area />
 --
 area :: Html  -- ^ Resulting HTML.
-area = Leaf "area" "<area" " />"
+area = Leaf "area" "<area" " />" ()
 {-# INLINE area #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -321,7 +321,7 @@
 -- > <base />
 --
 base :: Html  -- ^ Resulting HTML.
-base = Leaf "base" "<base" " />"
+base = Leaf "base" "<base" " />" ()
 {-# INLINE base #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -392,7 +392,7 @@
 -- > <br />
 --
 br :: Html  -- ^ Resulting HTML.
-br = Leaf "br" "<br" " />"
+br = Leaf "br" "<br" " />" ()
 {-# INLINE br #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -499,7 +499,7 @@
 -- > <col />
 --
 col :: Html  -- ^ Resulting HTML.
-col = Leaf "col" "<col" " />"
+col = Leaf "col" "<col" " />" ()
 {-# INLINE col #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -714,7 +714,7 @@
 -- > <embed />
 --
 embed :: Html  -- ^ Resulting HTML.
-embed = Leaf "embed" "<embed" " />"
+embed = Leaf "embed" "<embed" " />" ()
 {-# INLINE embed #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -983,7 +983,7 @@
 -- > <hr />
 --
 hr :: Html  -- ^ Resulting HTML.
-hr = Leaf "hr" "<hr" " />"
+hr = Leaf "hr" "<hr" " />" ()
 {-# INLINE hr #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1054,7 +1054,7 @@
 -- > <img />
 --
 img :: Html  -- ^ Resulting HTML.
-img = Leaf "img" "<img" " />"
+img = Leaf "img" "<img" " />" ()
 {-# INLINE img #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1071,7 +1071,7 @@
 -- > <input />
 --
 input :: Html  -- ^ Resulting HTML.
-input = Leaf "input" "<input" " />"
+input = Leaf "input" "<input" " />" ()
 {-# INLINE input #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1124,7 +1124,7 @@
 -- > <keygen />
 --
 keygen :: Html  -- ^ Resulting HTML.
-keygen = Leaf "keygen" "<keygen" " />"
+keygen = Leaf "keygen" "<keygen" " />" ()
 {-# INLINE keygen #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1195,7 +1195,7 @@
 -- > <link />
 --
 link :: Html  -- ^ Resulting HTML.
-link = Leaf "link" "<link" " />"
+link = Leaf "link" "<link" " />" ()
 {-# INLINE link #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1284,7 +1284,7 @@
 -- > <menuitem />
 --
 menuitem :: Html  -- ^ Resulting HTML.
-menuitem = Leaf "menuitem" "<menuitem" " />"
+menuitem = Leaf "menuitem" "<menuitem" " />" ()
 {-# INLINE menuitem #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1301,7 +1301,7 @@
 -- > <meta />
 --
 meta :: Html  -- ^ Resulting HTML.
-meta = Leaf "meta" "<meta" " />"
+meta = Leaf "meta" "<meta" " />" ()
 {-# INLINE meta #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1480,7 +1480,7 @@
 -- > <param />
 --
 param :: Html  -- ^ Resulting HTML.
-param = Leaf "param" "<param" " />"
+param = Leaf "param" "<param" " />" ()
 {-# INLINE param #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1695,7 +1695,7 @@
 -- > <source />
 --
 source :: Html  -- ^ Resulting HTML.
-source = Leaf "source" "<source" " />"
+source = Leaf "source" "<source" " />" ()
 {-# INLINE source #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -2000,7 +2000,7 @@
 -- > <track />
 --
 track :: Html  -- ^ Resulting HTML.
-track = Leaf "track" "<track" " />"
+track = Leaf "track" "<track" " />" ()
 {-# INLINE track #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -2071,5 +2071,5 @@
 -- > <wbr />
 --
 wbr :: Html  -- ^ Resulting HTML.
-wbr = Leaf "wbr" "<wbr" " />"
+wbr = Leaf "wbr" "<wbr" " />" ()
 {-# INLINE wbr #-}
diff --git a/src/Util/GenerateHtmlCombinators.hs b/src/Util/GenerateHtmlCombinators.hs
--- a/src/Util/GenerateHtmlCombinators.hs
+++ b/src/Util/GenerateHtmlCombinators.hs
@@ -236,7 +236,7 @@
     , "--"
     , function ++ " :: Html  -- ^ Resulting HTML."
     , function ++ " = Leaf \"" ++ tag ++ "\" \"<" ++ tag ++ "\" " ++ "\""
-               ++ (if closing then " /" else "") ++ ">\""
+               ++ (if closing then " /" else "") ++ ">\" ()"
     , "{-# INLINE " ++ function ++ " #-}"
     ]
   where