diff --git a/format-master.xml b/format-master.xml
index 64a1049..8a4c649 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -888,8 +888,8 @@
 			-->
 			<xsl:choose>
 				<!--
-					If the first sub-node of the <definition> is a text
-					node, then the whole thing should be just simple
+					If the first sub-node of the <definition> is NOT a
+					<p> node, then the whole thing should be just simple
 					text and contain only basic formatting elements, if
 					anything (i.e., no lists!). We therefore just wrap
 					the <keyword> and <definition> within a <P> with a
@@ -903,7 +903,7 @@
 					This probably is the most common case, so test for
 					it first.
 				-->
-				<xsl:when test="not(name(child::node()[2]/node()[1]))">
+				<xsl:when test="not(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>
@@ -911,7 +911,7 @@
 					</P>
 				</xsl:when>
 				<!--
-					If the first sub-node of the <definition> is a <p>
+					If the first sub-node of the <definition> IS a <p>
 					or <paragraph>, then we need to skip over the
 					processing of this element to avoid nested <P>s in
 					the output. Any remaining sub-nodes are processed
@@ -922,7 +922,7 @@
 					because there isn't an <itemize> template with the
 					appropriate mode (nor is there a need for one). Grr.
 				-->
-				<xsl:when test="child::node()[2]/child::node()[1][self::p] or child::node()[2]/child::node()[1][self::paragraph]">
+				<xsl:otherwise>
 					<P CLASS="definition1">
 						<xsl:apply-templates select="child::node()[1]" />
 						<xsl:text> </xsl:text>
@@ -931,25 +931,6 @@
 					<xsl:apply-templates select="child::node()[2]/*[position() > 1]">
 						<xsl:with-param name="HTMLStyle">definition2</xsl:with-param>
 					</xsl:apply-templates>
-				</xsl:when>
-				<!--
-					In all other cases, dump out the keyword in its own
-					paragraph, then zip through the list of sub-nodes
-					and process them normally, with the addition of the
-					HTMLStyle parameter, as noted above.
-					
-					If there are more than one, wrap the <keyword> and
-					the first <paragraph> of the <definition> in a
-					hanging <P>, then wrap the remainder in indented,
-					non-hanging <P>s.
-				-->
-				<xsl:otherwise>
-					<P CLASS="definition1">
-						<xsl:apply-templates select="child::node()[1]" />
-					</P>
-					<xsl:apply-templates select="child::node()[2]/node()">
-						<xsl:with-param name="HTMLStyle">definition2</xsl:with-param>
-					</xsl:apply-templates>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>