diff --git a/format-master.xml b/format-master.xml
index 18cc125..05dc581 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -688,7 +688,7 @@
 					because there isn't an <itemize> template with the
 					appropriate mode (nor is there a need for one). Grr.
 				-->
-				<xsl:when test="(name(child::node()[2]/child::node()[1]) = 'p') or (name(child::node()[2]/child::node()[1]) = 'paragraph')">
+				<xsl:when test="child::node()[2]/child::node()[1][self::p] or child::node()[2]/child::node()[1][self::paragraph]">
 					<P CLASS="definition1">
 						<xsl:apply-templates select="child::node()[1]"/>
 						<xsl:text> </xsl:text>
@@ -713,7 +713,7 @@
 					<P CLASS="definition1">
 						<xsl:apply-templates select="child::node()[1]"/>
 					</P>
-					<xsl:apply-templates select="child::node()[2]/*">
+					<xsl:apply-templates select="child::node()[2]/node()">
 						<xsl:with-param name="HTMLStyle">definition2</xsl:with-param>
 					</xsl:apply-templates>
 				</xsl:otherwise>