===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- docbook2mdoc/docbook2mdoc.c	2019/03/22 18:02:07	1.63
+++ docbook2mdoc/docbook2mdoc.c	2019/03/22 19:07:07	1.64
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.63 2019/03/22 18:02:07 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.64 2019/03/22 19:07:07 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -245,10 +245,10 @@ xml_char(void *arg, const XML_Char *p, int sz)
 	int		 i;
 
 	/* Stopped or no tree yet. */
-	if (ps->stop || NODE_ROOT == ps->node)
+	if (ps->stop || ps->node == NODE_ROOT)
 		return;
 
-	assert(NULL != ps->cur);
+	assert(ps->cur != NULL);
 
 	/*
 	 * Are we in the midst of processing text?
@@ -257,7 +257,7 @@ xml_char(void *arg, const XML_Char *p, int sz)
 	 * However, don't do so unless we have some non-whitespace to
 	 * process: strip out all leading whitespace to be sure.
 	 */
-	if (NODE_TEXT != ps->node) {
+	if (ps->node != NODE_TEXT) {
 		for (i = 0; i < sz; i++)
 			if ( ! isspace((unsigned char)p[i]))
 				break;
@@ -266,7 +266,7 @@ xml_char(void *arg, const XML_Char *p, int sz)
 		p += i;
 		sz -= i;
 		dat = calloc(1, sizeof(struct pnode));
-		if (NULL == dat) {
+		if (dat == NULL) {
 			perror(NULL);
 			exit(1);
 		}
@@ -277,14 +277,14 @@ xml_char(void *arg, const XML_Char *p, int sz)
 		TAILQ_INIT(&dat->attrq);
 		TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child);
 		ps->cur = dat;
-		assert(NULL != ps->root);
+		assert(ps->root != NULL);
 	}
 
 	/* Append to current buffer. */
 	assert(sz >= 0);
 	ps->cur->b = realloc(ps->cur->b,
 		ps->cur->bsz + (size_t)sz);
-	if (NULL == ps->cur->b) {
+	if (ps->cur->b == NULL) {
 		perror(NULL);
 		exit(1);
 	}
@@ -296,8 +296,7 @@ xml_char(void *arg, const XML_Char *p, int sz)
 static void
 pnode_trim(struct pnode *pn)
 {
-
-	assert(NODE_TEXT == pn->node);
+	assert(pn->node == NODE_TEXT);
 	for ( ; pn->bsz > 0; pn->bsz--)
 		if ( ! isspace((unsigned char)pn->b[pn->bsz - 1]))
 			break;
@@ -329,31 +328,29 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 	const XML_Char	**att;
 
 	/* FIXME: find a better way to ditch other namespaces. */
-	if (ps->stop || 0 == strcmp(name, "xi:include"))
+	if (ps->stop || strcmp(name, "xi:include") == 0)
 		return;
 
 	/* Close out text node, if applicable... */
-	if (NODE_TEXT == ps->node) {
-		assert(NULL != ps->cur);
+	if (ps->node == NODE_TEXT) {
 		pnode_trim(ps->cur);
 		ps->cur = ps->cur->parent;
-		assert(NULL != ps->cur);
 		ps->node = ps->cur->node;
 	}
 
-	for (node = nodes; NULL != node->name; node++)
-		if (0 == strcmp(node->name, name))
+	for (node = nodes; node->name != NULL; node++)
+		if (strcmp(node->name, name) == 0)
 			break;
 
-	if (NULL == node->name) {
-		if (NODE_ROOT == ps->node)
+	if (node->name == NULL) {
+		if (ps->node == NODE_ROOT)
 			return;
 		fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n",
 			ps->fname, XML_GetCurrentLineNumber(ps->xml),
 			XML_GetCurrentColumnNumber(ps->xml), name);
 		ps->stop = 1;
 		return;
-	} else if (NODE_ROOT == ps->node && NULL != ps->root) {
+	} else if (ps->node == NODE_ROOT && ps->root != NULL) {
 		fprintf(stderr, "%s:%zu:%zu: multiple refentries\n",
 			ps->fname, XML_GetCurrentLineNumber(ps->xml),
 			XML_GetCurrentColumnNumber(ps->xml));
@@ -361,10 +358,10 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 		return;
 	}
 
-	if (NODE_INLINEEQUATION == node->node)
+	if (node->node == NODE_INLINEEQUATION)
 		ps->flags |= PARSE_EQN;
 
-	if (NULL == (dat = calloc(1, sizeof(struct pnode)))) {
+	if ((dat = calloc(1, sizeof(struct pnode))) == NULL) {
 		perror(NULL);
 		exit(1);
 	}
@@ -374,21 +371,21 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 	TAILQ_INIT(&dat->childq);
 	TAILQ_INIT(&dat->attrq);
 
-	if (NULL != ps->cur)
+	if (ps->cur != NULL)
 		TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child);
 
 	ps->cur = dat;
-	if (NULL == ps->root)
+	if (ps->root == NULL)
 		ps->root = dat;
 
 	/*
 	 * Process attributes.
 	 */
-	for (att = atts; NULL != *att; att += 2) {
+	for (att = atts; *att != NULL; att += 2) {
 		for (key = 0; key < ATTRKEY__MAX; key++)
-			if (0 == strcmp(*att, attrkeys[key]))
+			if (strcmp(*att, attrkeys[key]) == 0)
 				break;
-		if (ATTRKEY__MAX == key) {
+		if (key == ATTRKEY__MAX) {
 			if (warn)
 				fprintf(stderr, "%s:%zu:%zu: warning: "
 					"unknown attribute \"%s\"\n",
@@ -399,13 +396,13 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 			continue;
 		}
 		for (val = 0; val < ATTRVAL__MAX; val++)
-			if (0 == strcmp(*(att + 1), attrvals[val]))
+			if (strcmp(att[1], attrvals[val]) == 0)
 				break;
 		pattr = calloc(1, sizeof(struct pattr));
 		pattr->key = key;
 		pattr->val = val;
-		if (ATTRVAL__MAX == val)
-			pattr->rawval = strdup(*(att + 1));
+		if (val == ATTRVAL__MAX)
+			pattr->rawval = strdup(att[1]);
 		TAILQ_INSERT_TAIL(&dat->attrq, pattr, child);
 	}
 
@@ -422,21 +419,19 @@ xml_elem_end(void *arg, const XML_Char *name)
 	struct parse	*ps = arg;
 
 	/* FIXME: find a better way to ditch other namespaces. */
-	if (ps->stop || NODE_ROOT == ps->node)
+	if (ps->stop || ps->node == NODE_ROOT)
 		return;
-	else if (0 == strcmp(name, "xi:include"))
+	else if (strcmp(name, "xi:include") == 0)
 		return;
 
 	/* Close out text node, if applicable... */
-	if (NODE_TEXT == ps->node) {
-		assert(NULL != ps->cur);
+	if (ps->node == NODE_TEXT) {
 		pnode_trim(ps->cur);
 		ps->cur = ps->cur->parent;
-		assert(NULL != ps->cur);
 		ps->node = ps->cur->node;
 	}
 
-	if (NULL == (ps->cur = ps->cur->parent))
+	if ((ps->cur = ps->cur->parent) == NULL)
 		ps->node = NODE_ROOT;
 	else
 		ps->node = ps->cur->node;
@@ -451,15 +446,15 @@ pnode_free(struct pnode *pn)
 	struct pnode	*pp;
 	struct pattr	*ap;
 
-	if (NULL == pn)
+	if (pn == NULL)
 		return;
 
-	while (NULL != (pp = TAILQ_FIRST(&pn->childq))) {
+	while ((pp = TAILQ_FIRST(&pn->childq)) != NULL) {
 		TAILQ_REMOVE(&pn->childq, pp, child);
 		pnode_free(pp);
 	}
 
-	while (NULL != (ap = TAILQ_FIRST(&pn->attrq))) {
+	while ((ap = TAILQ_FIRST(&pn->attrq)) != NULL) {
 		TAILQ_REMOVE(&pn->attrq, ap, child);
 		free(ap->rawval);
 		free(ap);
@@ -475,8 +470,7 @@ pnode_free(struct pnode *pn)
 static void
 pnode_unlink(struct pnode *pn)
 {
-
-	if (NULL != pn->parent)
+	if (pn->parent != NULL)
 		TAILQ_REMOVE(&pn->parent->childq, pn, child);
 	pnode_free(pn);
 }
@@ -518,7 +512,7 @@ pnode_getattr_raw(struct pnode *pn, enum attrkey key, 
 
 	TAILQ_FOREACH(ap, &pn->attrq, child)
 		if (ap->key == key)
-			return ATTRVAL__MAX == ap->val ? ap->rawval :
+			return ap->val == ATTRVAL__MAX ? ap->rawval :
 			    attrvals[ap->val];
 	return defval;
 }
@@ -542,10 +536,10 @@ static void
 bufappend(struct parse *p, struct pnode *pn)
 {
 
-	assert(NODE_TEXT == pn->node);
+	assert(pn->node == NODE_TEXT);
 	if (p->bsz + pn->bsz + 1 > p->mbsz) {
 		p->mbsz = p->bsz + pn->bsz + 1;
-		if (NULL == (p->b = realloc(p->b, p->mbsz))) {
+		if ((p->b = realloc(p->b, p->mbsz)) == NULL) {
 			perror(NULL);
 			exit(1);
 		}
@@ -566,7 +560,7 @@ bufappend_r(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 
-	if (NODE_TEXT == pn->node)
+	if (pn->node == NODE_TEXT)
 		bufappend(p, pn);
 	TAILQ_FOREACH(pp, &pn->childq, child)
 		bufappend_r(p, pp);
@@ -584,7 +578,7 @@ pnode_findfirst(struct pnode *pn, enum nodeid node)
 	TAILQ_FOREACH(pp, &pn->childq, child) {
 		res = pp->node == node ? pp :
 			pnode_findfirst(pp, node);
-		if (NULL != res)
+		if (res != NULL)
 			break;
 	}
 
@@ -603,37 +597,34 @@ pnode_printmacrolinetext(struct parse *p, struct pnode
 {
 	char		*cp;
 
-	if (0 == p->newln && ! (MACROLINE_NOWS & fl))
+	if (p->newln == 0 && (fl & MACROLINE_NOWS) == 0)
 		putchar(' ');
 
 	bufclear(p);
 	bufappend_r(p, pn);
 
 	/* Convert all space to spaces. */
-	for (cp = p->b; '\0' != *cp; cp++)
+	for (cp = p->b; *cp != '\0'; cp++)
 		if (isspace((unsigned char)*cp))
 			*cp = ' ';
 
 	for (cp = p->b; isspace((unsigned char)*cp); cp++)
 		/* Spin past whitespace (XXX: necessary?) */ ;
-	for ( ; '\0' != *cp; cp++) {
+	for ( ; *cp != '\0'; cp++) {
 		/* Escape us if we look like a macro. */
-		if ((cp == p->b || ' ' == *(cp - 1)) &&
-			isupper((unsigned char)*cp) &&
-			'\0' != *(cp + 1) &&
-			islower((unsigned char)*(cp + 1)) &&
-			('\0' == *(cp + 2) ||
-			 ' ' == *(cp + 2) ||
-			 (islower((unsigned char)*(cp + 2)) &&
-			  ('\0' == *(cp + 3) ||
-			   ' ' == *(cp + 3)))))
+		if ((cp == p->b || cp[-1] == ' ') &&
+		    isupper((unsigned char)cp[0]) &&
+		    islower((unsigned char)cp[1]) &&
+		    (cp[2] == '\0' || cp[2] == ' ' ||
+		     (islower((unsigned char)cp[2]) &&
+		      (cp[3] == '\0' || cp[3] == ' '))))
 			fputs("\\&", stdout);
-		if (MACROLINE_UPPER & fl)
+		if (fl & MACROLINE_UPPER)
 			putchar(toupper((unsigned char)*cp));
 		else
 			putchar(*cp);
 		/* If we're a character escape, escape us. */
-		if ('\\' == *cp)
+		if (*cp == '\\')
 			putchar('e');
 	}
 }
@@ -652,8 +643,7 @@ pnode_printmacrolinepart(struct parse *p, struct pnode
 static void
 pnode_printmacroline(struct parse *p, struct pnode *pn)
 {
-
-	assert(0 == p->newln);
+	assert(p->newln == 0);
 	pnode_printmacrolinetext(p, pn, 0);
 	putchar('\n');
 	p->newln = 1;
@@ -692,18 +682,18 @@ pnode_printmclosepunct(struct parse *p, struct pnode *
 		return;
 
 	/* No next node or it's not text. */
-	if (NULL == (pn = TAILQ_NEXT(pn, child))) {
+	if ((pn = TAILQ_NEXT(pn, child)) == NULL) {
 		pnode_printmclose(p, sv);
 		return;
-	} else if (NODE_TEXT != pn->node) {
+	} else if (pn->node != NODE_TEXT) {
 		pnode_printmclose(p, sv);
 		return;
 	}
 
 	/* Only do this for the comma/period. */
 	if (pn->bsz > 0 &&
-		(',' == pn->b[0] || '.' == pn->b[0]) &&
-		(1 == pn->bsz || isspace((unsigned char)pn->b[1]))) {
+	    (pn->b[0] == ',' || pn->b[0] == '.') &&
+	    (pn->bsz == 1 || isspace((unsigned char)pn->b[1]))) {
 		putchar(' ');
 		putchar(pn->b[0]);
 		pn->b++;
@@ -748,7 +738,7 @@ pnode_printrefsynopsisdiv(struct parse *p, struct pnod
 	struct pnode	*pp;
 
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
+		if (pp->node == NODE_TITLE) {
 			pnode_unlink(pp);
 			return;
 		}
@@ -764,12 +754,12 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 	const char	*title;
 	int		 flags, level;
 
-	if (NULL == pn->parent)
+	if (pn->parent == NULL)
 		return;
 
 	level = ++p->level;
-	flags = 1 == level ? MACROLINE_UPPER : 0;
-	if (3 > level) {
+	flags = level == 1 ? MACROLINE_UPPER : 0;
+	if (level < 3) {
 		switch (pn->node) {
 		case NODE_CAUTION:
 		case NODE_NOTE:
@@ -783,10 +773,10 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 	}
 
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node)
+		if (pp->node == NODE_TITLE)
 			break;
 
-	if (NULL == pp) {
+	if (pp == NULL) {
 		switch (pn->node) {
 		case NODE_PREFACE:
 			title = "Preface";
@@ -822,7 +812,7 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 		break;
 	}
 
-	if (NULL != pp) {
+	if (pp != NULL) {
 		p->newln = 0;
 		pnode_printmacrolinetext(p, pp, flags);
 		pnode_printmclose(p, 1);
@@ -841,17 +831,17 @@ pnode_printciterefentry(struct parse *p, struct pnode 
 
 	title = manvol = NULL;
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_MANVOLNUM == pp->node)
+		if (pp->node == NODE_MANVOLNUM)
 			manvol = pp;
-		else if (NODE_REFENTRYTITLE == pp->node)
+		else if (pp->node == NODE_REFENTRYTITLE)
 			title = pp;
 
-	if (NULL != title) {
+	if (title != NULL)
 		pnode_printmacrolinepart(p, title);
-	} else
+	else
 		fputs(" unknown ", stdout);
 
-	if (NULL == manvol) {
+	if (manvol == NULL) {
 		puts(" 1");
 		p->newln = 1;
 	} else
@@ -866,20 +856,20 @@ pnode_printrefmeta(struct parse *p, struct pnode *pn)
 	title = manvol = NULL;
 	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_MANVOLNUM == pp->node)
+		if (pp->node == NODE_MANVOLNUM)
 			manvol = pp;
-		else if (NODE_REFENTRYTITLE == pp->node)
+		else if (pp->node == NODE_REFENTRYTITLE)
 			title = pp;
 
 	fputs(".Dt", stdout);
 	p->newln = 0;
 
-	if (NULL != title)
+	if (title != NULL)
 		pnode_printmacrolinetext(p, title, MACROLINE_UPPER);
 	else
 		fputs(" UNKNOWN ", stdout);
 
-	if (NULL == manvol) {
+	if (manvol == NULL) {
 		puts(" 1");
 		p->newln = 1;
 	} else
@@ -894,18 +884,18 @@ pnode_printfuncdef(struct parse *p, struct pnode *pn)
 	assert(p->newln);
 	ftype = func = NULL;
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TEXT == pp->node)
+		if (pp->node == NODE_TEXT)
 			ftype = pp;
-		else if (NODE_FUNCTION == pp->node)
+		else if (pp->node == NODE_FUNCTION)
 			func = pp;
 
-	if (NULL != ftype) {
+	if (ftype != NULL) {
 		fputs(".Ft", stdout);
 		p->newln = 0;
 		pnode_printmacroline(p, ftype);
 	}
 
-	if (NULL != func) {
+	if (func != NULL) {
 		fputs(".Fo", stdout);
 		p->newln = 0;
 		pnode_printmacroline(p, func);
@@ -923,19 +913,19 @@ pnode_printparamdef(struct parse *p, struct pnode *pn)
 	assert(p->newln);
 	ptype = param = NULL;
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TEXT == pp->node)
+		if (pp->node == NODE_TEXT)
 			ptype = pp;
-		else if (NODE_PARAMETER == pp->node)
+		else if (pp->node == NODE_PARAMETER)
 			param = pp;
 
 	fputs(".Fa \"", stdout);
 	p->newln = 0;
-	if (NULL != ptype) {
+	if (ptype != NULL) {
 		pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS);
 		putchar(' ');
 	}
 
-	if (NULL != param)
+	if (param != NULL)
 		pnode_printmacrolinepart(p, param);
 
 	puts("\"");
@@ -958,7 +948,7 @@ pnode_printmathfenced(struct parse *p, struct pnode *p
 	pp = TAILQ_FIRST(&pn->childq);
 	pnode_print(p, pp);
 
-	while (NULL != (pp = TAILQ_NEXT(pp, child))) {
+	while ((pp = TAILQ_NEXT(pp, child)) != NULL) {
 		putchar(',');
 		pnode_print(p, pp);
 	}
@@ -1005,16 +995,16 @@ pnode_printfuncprototype(struct parse *p, struct pnode
 
 	assert(p->newln);
 	TAILQ_FOREACH(fdef, &pn->childq, child)
-		if (NODE_FUNCDEF == fdef->node)
+		if (fdef->node == NODE_FUNCDEF)
 			break;
 
-	if (NULL != fdef)
+	if (fdef != NULL)
 		pnode_printfuncdef(p, fdef);
 	else
 		puts(".Fo UNKNOWN");
 
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_PARAMDEF == pp->node)
+		if (pp->node == NODE_PARAMDEF)
 			pnode_printparamdef(p, pp);
 
 	puts(".Fc");
@@ -1038,12 +1028,10 @@ pnode_printarg(struct parse *p, struct pnode *pn)
 	isop = 1;
 	isrep = 0;
 	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_CHOICE == ap->key &&
-			(ATTRVAL_PLAIN == ap->val ||
-			 ATTRVAL_REQ == ap->val))
+		if (ap->key == ATTRKEY_CHOICE &&
+		    (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ))
 			isop = 0;
-		else if (ATTRKEY_REP == ap->key &&
-			(ATTRVAL_REPEAT == ap->val))
+		else if (ap->key == ATTRKEY_REP && ap->val == ATTRVAL_REPEAT)
 			isrep = 1;
 
 	if (isop) {
@@ -1052,12 +1040,12 @@ pnode_printarg(struct parse *p, struct pnode *pn)
 	}
 
 	TAILQ_FOREACH(pp, &pn->childq, child) {
-		if (NODE_TEXT == pp->node) {
+		if (pp->node == NODE_TEXT) {
 			pnode_printmopen(p);
 			fputs("Ar", stdout);
 		}
 		pnode_print(p, pp);
-		if (NODE_TEXT == pp->node && isrep)
+		if (isrep && pp->node == NODE_TEXT)
 			fputs("...", stdout);
 	}
 }
@@ -1071,9 +1059,8 @@ pnode_printgroup(struct parse *p, struct pnode *pn)
 
 	isop = 1;
 	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_CHOICE == ap->key &&
-			(ATTRVAL_PLAIN == ap->val ||
-			 ATTRVAL_REQ == ap->val)) {
+		if (ap->key == ATTRKEY_CHOICE &&
+		    (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) {
 			isop = 0;
 			break;
 		}
@@ -1101,7 +1088,7 @@ pnode_printgroup(struct parse *p, struct pnode *pn)
 	TAILQ_FOREACH(pp, &pn->childq, child) {
 		pnode_print(p, pp);
 		np = TAILQ_NEXT(pp, child);
-		while (NULL != np) {
+		while (np != NULL) {
 			if (pp->node != np->node)
 				break;
 			fputs(" |", stdout);
@@ -1119,11 +1106,11 @@ pnode_printprologue(struct parse *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 
-	pp = NULL == p->root ? NULL :
+	pp = p->root == NULL ? NULL :
 		pnode_findfirst(p->root, NODE_REFMETA);
 
 	puts(".Dd $Mdocdate" "$");
-	if (NULL != pp) {
+	if (pp != NULL) {
 		pnode_printrefmeta(p, pp);
 		pnode_unlink(pp);
 	} else
@@ -1131,7 +1118,7 @@ pnode_printprologue(struct parse *p, struct pnode *pn)
 		    pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN"));
 	puts(".Os");
 
-	if (PARSE_EQN & p->flags) {
+	if (p->flags & PARSE_EQN) {
 		puts(".EQ");
 		puts("delim $$");
 		puts(".EN");
@@ -1153,7 +1140,7 @@ pnode_printvarlistentry(struct parse *p, struct pnode 
 	p->newln = 0;
 
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TERM == pp->node) {
+		if (pp->node == NODE_TERM) {
 			if ( ! first)
 				putchar(',');
 			pnode_print(p, pp);
@@ -1190,14 +1177,14 @@ pnode_printtable(struct parse *p, struct pnode *pn)
 
 	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
+		if (pp->node == NODE_TITLE) {
 			pnode_printpara(p, pp);
 			pnode_print(p, pp);
 			pnode_unlink(pp);
 		}
 	assert(p->newln);
 	puts(".Bl -ohang");
-	while (NULL != (pp = pnode_findfirst(pn, NODE_ROW))) {
+	while ((pp = pnode_findfirst(pn, NODE_ROW)) != NULL) {
 		puts(".It Table Row");
 		pnode_printrow(p, pp);
 		pnode_printmclose(p, 1);
@@ -1214,14 +1201,14 @@ pnode_printlist(struct parse *p, struct pnode *pn)
 
 	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
+		if (pp->node == NODE_TITLE) {
 			pnode_printpara(p, pp);
 			pnode_print(p, pp);
 			pnode_unlink(pp);
 		}
 	assert(p->newln);
 
-	if (NODE_ORDEREDLIST == pn->node)
+	if (pn->node == NODE_ORDEREDLIST)
 		puts(".Bl -enum");
 	else
 		puts(".Bl -bullet");
@@ -1243,7 +1230,7 @@ pnode_printvariablelist(struct parse *p, struct pnode 
 
 	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
+		if (pp->node == NODE_TITLE) {
 			pnode_printpara(p, pp);
 			pnode_print(p, pp);
 			pnode_unlink(pp);
@@ -1252,7 +1239,7 @@ pnode_printvariablelist(struct parse *p, struct pnode 
 	assert(p->newln);
 	puts(".Bl -tag -width Ds");
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_VARLISTENTRY != pp->node) {
+		if (pp->node != NODE_VARLISTENTRY) {
 			assert(p->newln);
 			fputs(".It", stdout);
 			pnode_printmacroline(p, pp);
@@ -1278,7 +1265,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 	char		*cp;
 	int		 last, sv;
 
-	if (NULL == pn)
+	if (pn == NULL)
 		return;
 
 	sv = p->newln;
@@ -1383,7 +1370,7 @@ pnode_print(struct parse *p, struct pnode *pn)
 		break;
 	case NODE_LINK:
 		ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL);
-		if (NULL == ccp)
+		if (ccp == NULL)
 			break;
 		pnode_printmopen(p);
 		printf("Sx %s\n", ccp);
@@ -1442,9 +1429,8 @@ pnode_print(struct parse *p, struct pnode *pn)
 	case NODE_PROGRAMLISTING:
 	case NODE_SCREEN:
 		assert(p->newln);
-		printf(".Bd %s\n", ATTRVAL_MONOSPACED ==
-		    pnode_getattr(pn, ATTRKEY_CLASS) ?
-		    "-literal" : "-unfilled");
+		printf(".Bd %s\n", pnode_getattr(pn, ATTRKEY_CLASS) ==
+		    ATTRVAL_MONOSPACED ? "-literal" : "-unfilled");
 		break;
 	case NODE_REFENTRYINFO:
 		/* Suppress. */
@@ -1507,13 +1493,13 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_unlinksub(pn);
 		break;
 	case NODE_TEXT:
-		if (0 == p->newln)
+		if (p->newln == 0)
 			putchar(' ');
 
 		bufclear(p);
 		bufappend(p, pn);
 
-		if (0 == p->bsz) {
+		if (p->bsz == 0) {
 			assert(pn->real != pn->b);
 			break;
 		}
@@ -1532,23 +1518,23 @@ pnode_print(struct parse *p, struct pnode *pn)
 		 * before the actual flags themselves.
 		 * "Fl" does this for us, so remove it.
 		 */
-		if (NULL != pn->parent &&
-			NODE_OPTION == pn->parent->node &&
-			'-' == *cp)
+		if (pn->parent != NULL &&
+		    pn->parent->node == NODE_OPTION &&
+		    *cp == '-')
 			cp++;
-		for (last = '\n'; '\0' != *cp; ) {
-			if ('\n' == last) {
+		for (last = '\n'; *cp != '\0'; ) {
+			if (last == '\n') {
 				/* Consume all whitespace. */
 				if (isspace((unsigned char)*cp)) {
 					while (isspace((unsigned char)*cp))
 						cp++;
 					continue;
-				} else if ('\'' == *cp || '.' == *cp)
+				} else if (*cp == '\'' || *cp == '.')
 					fputs("\\&", stdout);
 			}
 			putchar(last = *cp++);
 			/* If we're a character escape, escape us. */
-			if ('\\' == last)
+			if (last == '\\')
 				putchar('e');
 		}
 		p->newln = 0;
@@ -1646,10 +1632,10 @@ pnode_print(struct parse *p, struct pnode *pn)
 		 * <refname> macros in sequence, then print out a
 		 * trailing comma before the newline.
 		 */
-		if (NULL != pn->parent &&
-			NODE_REFNAMEDIV == pn->parent->node &&
-			NULL != TAILQ_NEXT(pn, child) &&
-			NODE_REFNAME == TAILQ_NEXT(pn, child)->node)
+		if (pn->parent != NULL &&
+		    pn->parent->node == NODE_REFNAMEDIV &&
+		    TAILQ_NEXT(pn, child) != NULL &&
+		    TAILQ_NEXT(pn, child)->node == NODE_REFNAME)
 			fputs(" ,", stdout);
 		pnode_printmclose(p, sv);
 		break;
@@ -1702,7 +1688,7 @@ readfile(XML_Parser xp, int fd,
 	XML_SetUserData(xp, &p);
 
 	while ((ssz = read(fd, b, bsz)) >= 0) {
-		if (0 == (rc = XML_Parse(xp, b, ssz, 0 == ssz)))
+		if ((rc = XML_Parse(xp, b, ssz, 0 == ssz)) == 0)
 			fprintf(stderr, "%s:%zu:%zu: %s\n", fn,
 				XML_GetCurrentLineNumber(xp),
 				XML_GetCurrentColumnNumber(xp),
@@ -1749,7 +1735,7 @@ main(int argc, char *argv[])
 	buf = NULL;
 	rc = 1;
 
-	while (-1 != (ch = getopt(argc, argv, "W")))
+	while ((ch = getopt(argc, argv, "W")) != -1)
 		switch (ch) {
 		case 'W':
 			warn = 1;
@@ -1768,7 +1754,7 @@ main(int argc, char *argv[])
 		fname = argv[0];
 
 	/* Read from stdin or a file. */
-	fd = 0 == strcmp(fname, "-") ?
+	fd = strcmp(fname, "-") == 0 ?
 		STDIN_FILENO : open(fname, O_RDONLY, 0);
 
 	/*
@@ -1777,18 +1763,18 @@ main(int argc, char *argv[])
 	 * Create the parser context.
 	 * Dive directly into the parse.
 	 */
-	if (-1 == fd)
+	if (fd == -1)
 		perror(fname);
-	else if (NULL == (buf = malloc(4096)))
+	else if ((buf = malloc(4096)) == NULL)
 		perror(NULL);
-	else if (NULL == (xp = XML_ParserCreate(NULL)))
+	else if ((xp = XML_ParserCreate(NULL)) == NULL)
 		perror(NULL);
 	else if (readfile(xp, fd, buf, 4096, fname))
 		rc = 0;
 
 	XML_ParserFree(xp);
 	free(buf);
-	if (STDIN_FILENO != fd)
+	if (fd != STDIN_FILENO)
 		close(fd);
 	return rc;