diff --git a/src/document/sgml/html/attribute.inc b/src/document/sgml/html/attribute.inc
index d5358697b..e7372c2c5 100644
--- a/src/document/sgml/html/attribute.inc
+++ b/src/document/sgml/html/attribute.inc
@@ -2,126 +2,126 @@
 /* This list is made from http://www.w3.org/TR/REC-html40/index/attributes.html
  * unless otherwise noted. */
 
-HTML_NODE_INFO(ATTRIBUTE, ABBR,			0),
-HTML_NODE_INFO(ATTRIBUTE, ACCEPT,		0),
-HTML_NODE_INF2(ATTRIBUTE, ACCEPT_CHARSET, "ACCEPT-CHARSET", 0),
-HTML_NODE_INFO(ATTRIBUTE, ACCESSKEY,		0),
-HTML_NODE_INFO(ATTRIBUTE, ACTION,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, ALIGN,		0),
-HTML_NODE_INFO(ATTRIBUTE, ALINK,		0),
-HTML_NODE_INFO(ATTRIBUTE, ALT,			0),
-HTML_NODE_INFO(ATTRIBUTE, ARCHIVE,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, AXIS,			0),
-HTML_NODE_INFO(ATTRIBUTE, BACKGROUND,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, BGCOLOR,		0),
-HTML_NODE_INFO(ATTRIBUTE, BORDER,		0),
-HTML_NODE_INFO(ATTRIBUTE, BORDERCOLOR,		0), /* Not part of HTML4 specs */
-HTML_NODE_INFO(ATTRIBUTE, CELLPADDING,		0),
-HTML_NODE_INFO(ATTRIBUTE, CELLSPACING,		0),
-HTML_NODE_INFO(ATTRIBUTE, CHAR,			0),
-HTML_NODE_INFO(ATTRIBUTE, CHAROFF,		0),
-HTML_NODE_INFO(ATTRIBUTE, CHARSET,		0),
-HTML_NODE_INFO(ATTRIBUTE, CHECKED,		0),
-HTML_NODE_INFO(ATTRIBUTE, CITE,			SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, CLASS,		0),
-HTML_NODE_INFO(ATTRIBUTE, CLASSID,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, CLEAR,		0),
-HTML_NODE_INFO(ATTRIBUTE, CODE,			0),
-HTML_NODE_INFO(ATTRIBUTE, CODEBASE,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, CODETYPE,		0),
-HTML_NODE_INFO(ATTRIBUTE, COLOR,		0),
-HTML_NODE_INFO(ATTRIBUTE, COLS,			0),
-HTML_NODE_INFO(ATTRIBUTE, COLSPAN,		0),
-HTML_NODE_INFO(ATTRIBUTE, COMPACT,		0),
-HTML_NODE_INFO(ATTRIBUTE, CONTENT,		0),
-HTML_NODE_INFO(ATTRIBUTE, COORDS,		0),
-HTML_NODE_INFO(ATTRIBUTE, DATA,			SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, DATETIME,		0),
-HTML_NODE_INFO(ATTRIBUTE, DECLARE,		0),
-HTML_NODE_INFO(ATTRIBUTE, DEFER,		0),
-HTML_NODE_INFO(ATTRIBUTE, DIR,			0),
-HTML_NODE_INFO(ATTRIBUTE, DISABLED,		0),
-HTML_NODE_INFO(ATTRIBUTE, ENCTYPE,		0),
-HTML_NODE_INFO(ATTRIBUTE, FACE,			0),
-HTML_NODE_INFO(ATTRIBUTE, FOR,			0),
-HTML_NODE_INFO(ATTRIBUTE, FRAME,		0),
-HTML_NODE_INFO(ATTRIBUTE, FRAMEBORDER,		0),
-HTML_NODE_INFO(ATTRIBUTE, HEADERS,		0),
-HTML_NODE_INFO(ATTRIBUTE, HEIGHT,		0),
-HTML_NODE_INFO(ATTRIBUTE, HREF,			SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, HREFLANG,		0),
-HTML_NODE_INFO(ATTRIBUTE, HSPACE,		0),
-HTML_NODE_INF2(ATTRIBUTE, HTTP_EQUIV, "HTTP-EQUIV", 0),
-HTML_NODE_INFO(ATTRIBUTE, ID,			SGML_ATTRIBUTE_IDENTIFIER),
-HTML_NODE_INFO(ATTRIBUTE, ISMAP,		0),
-HTML_NODE_INFO(ATTRIBUTE, LABEL,		0),
-HTML_NODE_INFO(ATTRIBUTE, LANG,			0),
-HTML_NODE_INFO(ATTRIBUTE, LANGUAGE,		0),
-HTML_NODE_INFO(ATTRIBUTE, LINK,			0),
-HTML_NODE_INFO(ATTRIBUTE, LONGDESC,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, MARGINHEIGHT,		0),
-HTML_NODE_INFO(ATTRIBUTE, MARGINWIDTH,		0),
-HTML_NODE_INFO(ATTRIBUTE, MAXLENGTH,		0),
-HTML_NODE_INFO(ATTRIBUTE, MEDIA,		0),
-HTML_NODE_INFO(ATTRIBUTE, METHOD,		0),
-HTML_NODE_INFO(ATTRIBUTE, MULTIPLE,		0),
-HTML_NODE_INFO(ATTRIBUTE, NAME,			SGML_ATTRIBUTE_IDENTIFIER),
-HTML_NODE_INFO(ATTRIBUTE, NOHREF,		0),
-HTML_NODE_INFO(ATTRIBUTE, NORESIZE,		0),
-HTML_NODE_INFO(ATTRIBUTE, NOSHADE,		0),
-HTML_NODE_INFO(ATTRIBUTE, NOWRAP,		0),
-HTML_NODE_INFO(ATTRIBUTE, OBJECT,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONBLUR,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONCHANGE,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONCLICK,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONDBLCLICK,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONFOCUS,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONKEYDOWN,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONKEYPRESS,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONKEYUP,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONLOAD,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONMOUSEDOWN,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONMOUSEMOVE,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONMOUSEOUT,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONMOUSEOVER,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONMOUSEUP,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONRESET,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONSELECT,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONSUBMIT,		0),
-HTML_NODE_INFO(ATTRIBUTE, ONUNLOAD,		0),
-HTML_NODE_INFO(ATTRIBUTE, PROFILE,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, PROMPT,		0),
-HTML_NODE_INFO(ATTRIBUTE, READONLY,		0),
-HTML_NODE_INFO(ATTRIBUTE, REL,			0),
-HTML_NODE_INFO(ATTRIBUTE, REV,			0),
-HTML_NODE_INFO(ATTRIBUTE, ROWS,			0),
-HTML_NODE_INFO(ATTRIBUTE, ROWSPAN,		0),
-HTML_NODE_INFO(ATTRIBUTE, RULES,		0),
-HTML_NODE_INFO(ATTRIBUTE, SCHEME,		0),
-HTML_NODE_INFO(ATTRIBUTE, SCOPE,		0),
-HTML_NODE_INFO(ATTRIBUTE, SCROLLING,		0),
-HTML_NODE_INFO(ATTRIBUTE, SELECTED,		0),
-HTML_NODE_INFO(ATTRIBUTE, SHAPE,		0),
-HTML_NODE_INFO(ATTRIBUTE, SIZE,			0),
-HTML_NODE_INFO(ATTRIBUTE, SPAN,			0),
-HTML_NODE_INFO(ATTRIBUTE, SRC,			SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, STANDBY,		0),
-HTML_NODE_INFO(ATTRIBUTE, START,		0),
-HTML_NODE_INFO(ATTRIBUTE, STYLE,		0),
-HTML_NODE_INFO(ATTRIBUTE, SUMMARY,		0),
-HTML_NODE_INFO(ATTRIBUTE, TABINDEX,		0),
-HTML_NODE_INFO(ATTRIBUTE, TARGET,		0),
-HTML_NODE_INFO(ATTRIBUTE, TEXT,			0),
-HTML_NODE_INFO(ATTRIBUTE, TITLE,		0),
-HTML_NODE_INFO(ATTRIBUTE, TYPE,			0),
-HTML_NODE_INFO(ATTRIBUTE, URL,			0),
-HTML_NODE_INFO(ATTRIBUTE, USEMAP,		SGML_ATTRIBUTE_REFERENCE),
-HTML_NODE_INFO(ATTRIBUTE, VALIGN,		0),
-HTML_NODE_INFO(ATTRIBUTE, VALUE,		0),
-HTML_NODE_INFO(ATTRIBUTE, VALUETYPE,		0),
+HTML_(ATTRIBUTE, ABBR,			0),
+HTML_(ATTRIBUTE, ACCEPT,		0),
+HTM2_(ATTRIBUTE, ACCEPT_CHARSET, "ACCEPT-CHARSET", 0),
+HTML_(ATTRIBUTE, ACCESSKEY,		0),
+HTML_(ATTRIBUTE, ACTION,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, ALIGN,			0),
+HTML_(ATTRIBUTE, ALINK,			0),
+HTML_(ATTRIBUTE, ALT,			0),
+HTML_(ATTRIBUTE, ARCHIVE,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, AXIS,			0),
+HTML_(ATTRIBUTE, BACKGROUND,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, BGCOLOR,		0),
+HTML_(ATTRIBUTE, BORDER,		0),
+HTML_(ATTRIBUTE, BORDERCOLOR,		0), /* Not part of HTML4 specs */
+HTML_(ATTRIBUTE, CELLPADDING,		0),
+HTML_(ATTRIBUTE, CELLSPACING,		0),
+HTML_(ATTRIBUTE, CHAR,			0),
+HTML_(ATTRIBUTE, CHAROFF,		0),
+HTML_(ATTRIBUTE, CHARSET,		0),
+HTML_(ATTRIBUTE, CHECKED,		0),
+HTML_(ATTRIBUTE, CITE,			SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, CLASS,			0),
+HTML_(ATTRIBUTE, CLASSID,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, CLEAR,			0),
+HTML_(ATTRIBUTE, CODE,			0),
+HTML_(ATTRIBUTE, CODEBASE,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, CODETYPE,		0),
+HTML_(ATTRIBUTE, COLOR,			0),
+HTML_(ATTRIBUTE, COLS,			0),
+HTML_(ATTRIBUTE, COLSPAN,		0),
+HTML_(ATTRIBUTE, COMPACT,		0),
+HTML_(ATTRIBUTE, CONTENT,		0),
+HTML_(ATTRIBUTE, COORDS,		0),
+HTML_(ATTRIBUTE, DATA,			SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, DATETIME,		0),
+HTML_(ATTRIBUTE, DECLARE,		0),
+HTML_(ATTRIBUTE, DEFER,			0),
+HTML_(ATTRIBUTE, DIR,			0),
+HTML_(ATTRIBUTE, DISABLED,		0),
+HTML_(ATTRIBUTE, ENCTYPE,		0),
+HTML_(ATTRIBUTE, FACE,			0),
+HTML_(ATTRIBUTE, FOR,			0),
+HTML_(ATTRIBUTE, FRAME,			0),
+HTML_(ATTRIBUTE, FRAMEBORDER,		0),
+HTML_(ATTRIBUTE, HEADERS,		0),
+HTML_(ATTRIBUTE, HEIGHT,		0),
+HTML_(ATTRIBUTE, HREF,			SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, HREFLANG,		0),
+HTML_(ATTRIBUTE, HSPACE,		0),
+HTM2_(ATTRIBUTE, HTTP_EQUIV, "HTTP-EQUIV", 0),
+HTML_(ATTRIBUTE, ID,			SGML_ATTRIBUTE_IDENTIFIER),
+HTML_(ATTRIBUTE, ISMAP,			0),
+HTML_(ATTRIBUTE, LABEL,			0),
+HTML_(ATTRIBUTE, LANG,			0),
+HTML_(ATTRIBUTE, LANGUAGE,		0),
+HTML_(ATTRIBUTE, LINK,			0),
+HTML_(ATTRIBUTE, LONGDESC,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, MARGINHEIGHT,		0),
+HTML_(ATTRIBUTE, MARGINWIDTH,		0),
+HTML_(ATTRIBUTE, MAXLENGTH,		0),
+HTML_(ATTRIBUTE, MEDIA,			0),
+HTML_(ATTRIBUTE, METHOD,		0),
+HTML_(ATTRIBUTE, MULTIPLE,		0),
+HTML_(ATTRIBUTE, NAME,			SGML_ATTRIBUTE_IDENTIFIER),
+HTML_(ATTRIBUTE, NOHREF,		0),
+HTML_(ATTRIBUTE, NORESIZE,		0),
+HTML_(ATTRIBUTE, NOSHADE,		0),
+HTML_(ATTRIBUTE, NOWRAP,		0),
+HTML_(ATTRIBUTE, OBJECT,		0),
+HTML_(ATTRIBUTE, ONBLUR,		0),
+HTML_(ATTRIBUTE, ONCHANGE,		0),
+HTML_(ATTRIBUTE, ONCLICK,		0),
+HTML_(ATTRIBUTE, ONDBLCLICK,		0),
+HTML_(ATTRIBUTE, ONFOCUS,		0),
+HTML_(ATTRIBUTE, ONKEYDOWN,		0),
+HTML_(ATTRIBUTE, ONKEYPRESS,		0),
+HTML_(ATTRIBUTE, ONKEYUP,		0),
+HTML_(ATTRIBUTE, ONLOAD,		0),
+HTML_(ATTRIBUTE, ONMOUSEDOWN,		0),
+HTML_(ATTRIBUTE, ONMOUSEMOVE,		0),
+HTML_(ATTRIBUTE, ONMOUSEOUT,		0),
+HTML_(ATTRIBUTE, ONMOUSEOVER,		0),
+HTML_(ATTRIBUTE, ONMOUSEUP,		0),
+HTML_(ATTRIBUTE, ONRESET,		0),
+HTML_(ATTRIBUTE, ONSELECT,		0),
+HTML_(ATTRIBUTE, ONSUBMIT,		0),
+HTML_(ATTRIBUTE, ONUNLOAD,		0),
+HTML_(ATTRIBUTE, PROFILE,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, PROMPT,		0),
+HTML_(ATTRIBUTE, READONLY,		0),
+HTML_(ATTRIBUTE, REL,			0),
+HTML_(ATTRIBUTE, REV,			0),
+HTML_(ATTRIBUTE, ROWS,			0),
+HTML_(ATTRIBUTE, ROWSPAN,		0),
+HTML_(ATTRIBUTE, RULES,			0),
+HTML_(ATTRIBUTE, SCHEME,		0),
+HTML_(ATTRIBUTE, SCOPE,			0),
+HTML_(ATTRIBUTE, SCROLLING,		0),
+HTML_(ATTRIBUTE, SELECTED,		0),
+HTML_(ATTRIBUTE, SHAPE,			0),
+HTML_(ATTRIBUTE, SIZE,			0),
+HTML_(ATTRIBUTE, SPAN,			0),
+HTML_(ATTRIBUTE, SRC,			SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, STANDBY,		0),
+HTML_(ATTRIBUTE, START,			0),
+HTML_(ATTRIBUTE, STYLE,			0),
+HTML_(ATTRIBUTE, SUMMARY,		0),
+HTML_(ATTRIBUTE, TABINDEX,		0),
+HTML_(ATTRIBUTE, TARGET,		0),
+HTML_(ATTRIBUTE, TEXT,			0),
+HTML_(ATTRIBUTE, TITLE,			0),
+HTML_(ATTRIBUTE, TYPE,			0),
+HTML_(ATTRIBUTE, URL,			0),
+HTML_(ATTRIBUTE, USEMAP,		SGML_ATTRIBUTE_REFERENCE),
+HTML_(ATTRIBUTE, VALIGN,		0),
+HTML_(ATTRIBUTE, VALUE,			0),
+HTML_(ATTRIBUTE, VALUETYPE,		0),
 /* XXX: Apparently #VERSION doesn.t work .. some predefined VERSION macro? */
-HTML_NODE_INF2(ATTRIBUTE, VERSION, "VERSION",	0),
-HTML_NODE_INFO(ATTRIBUTE, VISIBILITY,		0),
-HTML_NODE_INFO(ATTRIBUTE, VLINK,		0),
-HTML_NODE_INFO(ATTRIBUTE, VSPACE,		0),
-HTML_NODE_INFO(ATTRIBUTE, WIDTH,		0),
+HTM2_(ATTRIBUTE, VERSION, "VERSION",	0),
+HTML_(ATTRIBUTE, VISIBILITY,		0),
+HTML_(ATTRIBUTE, VLINK,			0),
+HTML_(ATTRIBUTE, VSPACE,		0),
+HTML_(ATTRIBUTE, WIDTH,			0),
diff --git a/src/document/sgml/html/element.inc b/src/document/sgml/html/element.inc
index c8ecaf778..7daf1731a 100644
--- a/src/document/sgml/html/element.inc
+++ b/src/document/sgml/html/element.inc
@@ -2,94 +2,94 @@
 /* This list is made from http://www.w3.org/TR/REC-html40/index/elements.html
  * unless otherwise noted. */
 
-HTML_NODE_INFO(ELEMENT, A,		0),
-HTML_NODE_INFO(ELEMENT, ABBR,		0),
-HTML_NODE_INFO(ELEMENT, ACRONYM,	0),
-HTML_NODE_INFO(ELEMENT, ADDRESS,	0),
-HTML_NODE_INFO(ELEMENT, APPLET,		0),
-HTML_NODE_INFO(ELEMENT, AREA,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, B,		0),
-HTML_NODE_INFO(ELEMENT, BASE,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, BASEFONT,	SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, BDO,		0),
-HTML_NODE_INFO(ELEMENT, BIG,		0),
-HTML_NODE_INFO(ELEMENT, BLOCKQUOTE,	0),
-HTML_NODE_INFO(ELEMENT, BODY,		SGML_ELEMENT_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, BR,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, BUTTON,		0),
-HTML_NODE_INFO(ELEMENT, CAPTION,	0),
-HTML_NODE_INFO(ELEMENT, CENTER,		0),
-HTML_NODE_INFO(ELEMENT, CITE,		0),
-HTML_NODE_INFO(ELEMENT, CODE,		0),
-HTML_NODE_INFO(ELEMENT, COL,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, COLGROUP,	SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, DD,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, DEL,		0),
-HTML_NODE_INFO(ELEMENT, DFN,		0),
-HTML_NODE_INFO(ELEMENT, DIR,		0),
-HTML_NODE_INFO(ELEMENT, DIV,		0),
-HTML_NODE_INFO(ELEMENT, DL,		0),
-HTML_NODE_INFO(ELEMENT, DT,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, EM,		0),
-HTML_NODE_INFO(ELEMENT, FIELDSET,	0),
-HTML_NODE_INFO(ELEMENT, FONT,		0),
-HTML_NODE_INFO(ELEMENT, FORM,		0),
-HTML_NODE_INFO(ELEMENT, FRAME,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, FRAMESET,	0),
-HTML_NODE_INFO(ELEMENT, H1,		0),
-HTML_NODE_INFO(ELEMENT, H2,		0),
-HTML_NODE_INFO(ELEMENT, H3,		0),
-HTML_NODE_INFO(ELEMENT, H4,		0),
-HTML_NODE_INFO(ELEMENT, H5,		0),
-HTML_NODE_INFO(ELEMENT, H6,		0),
-HTML_NODE_INFO(ELEMENT, HEAD,		SGML_ELEMENT_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, HR,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, HTML,		SGML_ELEMENT_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, I,		0),
-HTML_NODE_INFO(ELEMENT, IFRAME,		0),
-HTML_NODE_INFO(ELEMENT, IMG,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, INPUT,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, INS,		0),
-HTML_NODE_INFO(ELEMENT, ISINDEX,	SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, KBD,		0),
-HTML_NODE_INFO(ELEMENT, LABEL,		0),
-HTML_NODE_INFO(ELEMENT, LEGEND,		0),
-HTML_NODE_INFO(ELEMENT, LI,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, LINK,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, MAP,		0),
-HTML_NODE_INFO(ELEMENT, MENU,		0),
-HTML_NODE_INFO(ELEMENT, META,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, NOFRAMES,	0),
-HTML_NODE_INFO(ELEMENT, NOSCRIPT,	0),
-HTML_NODE_INFO(ELEMENT, OBJECT,		0),
-HTML_NODE_INFO(ELEMENT, OL,		0),
-HTML_NODE_INFO(ELEMENT, OPTGROUP,	0),
-HTML_NODE_INFO(ELEMENT, OPTION,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, P,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, PARAM,		SGML_ELEMENT_EMPTY),
-HTML_NODE_INFO(ELEMENT, PRE,		0),
-HTML_NODE_INFO(ELEMENT, Q,		0),
-HTML_NODE_INFO(ELEMENT, S,		0),
-HTML_NODE_INFO(ELEMENT, SAMP,		0),
-HTML_NODE_INFO(ELEMENT, SELECT,		0),
-HTML_NODE_INFO(ELEMENT, SMALL,		0),
-HTML_NODE_INFO(ELEMENT, SPAN,		0),
-HTML_NODE_INFO(ELEMENT, STRIKE,		0),
-HTML_NODE_INFO(ELEMENT, STRONG,		0),
-HTML_NODE_INFO(ELEMENT, STYLE,		0),
-HTML_NODE_INFO(ELEMENT, SUB,		0),
-HTML_NODE_INFO(ELEMENT, SUP,		0),
-HTML_NODE_INFO(ELEMENT, TABLE,		0),
-HTML_NODE_INFO(ELEMENT, TBODY,		SGML_ELEMENT_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, TD,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, TEXTAREA,	0),
-HTML_NODE_INFO(ELEMENT, TFOOT,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, TH,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, THEAD,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, TITLE,		0),
-HTML_NODE_INFO(ELEMENT, TR,		SGML_ELEMENT_END_OPTIONAL),
-HTML_NODE_INFO(ELEMENT, TT,		0),
-HTML_NODE_INFO(ELEMENT, U,		0),
-HTML_NODE_INFO(ELEMENT, UL,		0),
-HTML_NODE_INFO(ELEMENT, VAR,		0),
-HTML_NODE_INFO(ELEMENT, XMP,		0), /* Not part of HTML4 spec. */
+HTML_(ELEMENT, A,		0),
+HTML_(ELEMENT, ABBR,		0),
+HTML_(ELEMENT, ACRONYM,		0),
+HTML_(ELEMENT, ADDRESS,		0),
+HTML_(ELEMENT, APPLET,		0),
+HTML_(ELEMENT, AREA,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, B,		0),
+HTML_(ELEMENT, BASE,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, BASEFONT,	SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, BDO,		0),
+HTML_(ELEMENT, BIG,		0),
+HTML_(ELEMENT, BLOCKQUOTE,	0),
+HTML_(ELEMENT, BODY,		SGML_ELEMENT_OPTIONAL),
+HTML_(ELEMENT, BR,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, BUTTON,		0),
+HTML_(ELEMENT, CAPTION,		0),
+HTML_(ELEMENT, CENTER,		0),
+HTML_(ELEMENT, CITE,		0),
+HTML_(ELEMENT, CODE,		0),
+HTML_(ELEMENT, COL,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, COLGROUP,	SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, DD,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, DEL,		0),
+HTML_(ELEMENT, DFN,		0),
+HTML_(ELEMENT, DIR,		0),
+HTML_(ELEMENT, DIV,		0),
+HTML_(ELEMENT, DL,		0),
+HTML_(ELEMENT, DT,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, EM,		0),
+HTML_(ELEMENT, FIELDSET,	0),
+HTML_(ELEMENT, FONT,		0),
+HTML_(ELEMENT, FORM,		0),
+HTML_(ELEMENT, FRAME,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, FRAMESET,	0),
+HTML_(ELEMENT, H1,		0),
+HTML_(ELEMENT, H2,		0),
+HTML_(ELEMENT, H3,		0),
+HTML_(ELEMENT, H4,		0),
+HTML_(ELEMENT, H5,		0),
+HTML_(ELEMENT, H6,		0),
+HTML_(ELEMENT, HEAD,		SGML_ELEMENT_OPTIONAL),
+HTML_(ELEMENT, HR,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, HTML,		SGML_ELEMENT_OPTIONAL),
+HTML_(ELEMENT, I,		0),
+HTML_(ELEMENT, IFRAME,		0),
+HTML_(ELEMENT, IMG,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, INPUT,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, INS,		0),
+HTML_(ELEMENT, ISINDEX,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, KBD,		0),
+HTML_(ELEMENT, LABEL,		0),
+HTML_(ELEMENT, LEGEND,		0),
+HTML_(ELEMENT, LI,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, LINK,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, MAP,		0),
+HTML_(ELEMENT, MENU,		0),
+HTML_(ELEMENT, META,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, NOFRAMES,	0),
+HTML_(ELEMENT, NOSCRIPT,	0),
+HTML_(ELEMENT, OBJECT,		0),
+HTML_(ELEMENT, OL,		0),
+HTML_(ELEMENT, OPTGROUP,	0),
+HTML_(ELEMENT, OPTION,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, P,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, PARAM,		SGML_ELEMENT_EMPTY),
+HTML_(ELEMENT, PRE,		0),
+HTML_(ELEMENT, Q,		0),
+HTML_(ELEMENT, S,		0),
+HTML_(ELEMENT, SAMP,		0),
+HTML_(ELEMENT, SELECT,		0),
+HTML_(ELEMENT, SMALL,		0),
+HTML_(ELEMENT, SPAN,		0),
+HTML_(ELEMENT, STRIKE,		0),
+HTML_(ELEMENT, STRONG,		0),
+HTML_(ELEMENT, STYLE,		0),
+HTML_(ELEMENT, SUB,		0),
+HTML_(ELEMENT, SUP,		0),
+HTML_(ELEMENT, TABLE,		0),
+HTML_(ELEMENT, TBODY,		SGML_ELEMENT_OPTIONAL),
+HTML_(ELEMENT, TD,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, TEXTAREA,	0),
+HTML_(ELEMENT, TFOOT,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, TH,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, THEAD,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, TITLE,		0),
+HTML_(ELEMENT, TR,		SGML_ELEMENT_END_OPTIONAL),
+HTML_(ELEMENT, TT,		0),
+HTML_(ELEMENT, U,		0),
+HTML_(ELEMENT, UL,		0),
+HTML_(ELEMENT, VAR,		0),
+HTML_(ELEMENT, XMP,		0), /* Not part of HTML4 spec. */
diff --git a/src/document/sgml/html/html.c b/src/document/sgml/html/html.c
index a32317f97..28cad646c 100644
--- a/src/document/sgml/html/html.c
+++ b/src/document/sgml/html/html.c
@@ -20,8 +20,8 @@
 #include "util/string.h"
 
 
-#define HTML_NODE_INFO(node, name, id)		SGML_NODE_INFO(HTML, node, name, id)
-#define HTML_NODE_INF2(node, name, str, id)	SGML_NODE_INF2(HTML, node, name, str, id)
+#define HTML_(node, name, id)		SGML_NODE_INFO(HTML, node, name, id)
+#define HTM2_(node, name, str, id)	SGML_NODE_INF2(HTML, node, name, str, id)
 #undef VERSION
 
 static struct sgml_node_info html_attributes[HTML_ATTRIBUTES] = {
@@ -40,7 +40,7 @@ static struct sgml_node_info html_elements[HTML_ELEMENTS] = {
 static struct dom_node *
 add_html_element_end_node(struct dom_stack *stack, struct dom_node *node, void *data)
 {
-	struct sgml_parser *parser = stack->data;
+	struct sgml_parser *parser = stack->parser;
 	struct dom_node *parent;
 	struct scanner_token *token;
 
@@ -67,7 +67,7 @@ add_html_element_end_node(struct dom_stack *stack, struct dom_node *node, void *
 static struct dom_node *
 add_html_element_node(struct dom_stack *stack, struct dom_node *node, void *data)
 {
-	struct sgml_parser *parser = stack->data;
+	struct sgml_parser *parser = stack->parser;
 
 	assert(stack && node);
 	assert(dom_stack_has_parents(stack));
diff --git a/src/document/sgml/html/html.h b/src/document/sgml/html/html.h
index 25f56e7cb..1d39da587 100644
--- a/src/document/sgml/html/html.h
+++ b/src/document/sgml/html/html.h
@@ -8,8 +8,8 @@
 extern struct sgml_info sgml_html_info;
 
 #undef VERSION
-#define HTML_NODE_INFO(node, name, flags)	SGML_NODE_INFO_TYPE(HTML, node, name)
-#define HTML_NODE_INF2(node, name, str, flags)	SGML_NODE_INFO_TYPE(HTML, node, name)
+#define HTML_(node, name, flags)	SGML_NODE_INFO_TYPE(HTML, node, name)
+#define HTM2_(node, name, str, flags)	SGML_NODE_INFO_TYPE(HTML, node, name)
 
 enum html_element_type {
 	HTML_ELEMENT_UNKNOWN,
@@ -27,7 +27,7 @@ enum html_attribute_type {
 	HTML_ATTRIBUTES,
 };
 
-#undef	HTML_NODE_INFO
-#undef	HTML_NODE_INF2
+#undef	HTML_
+#undef	HTM2_
 
 #endif