===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- mandoc/mdoc_macro.c	2015/04/02 22:48:17	1.185
+++ mandoc/mdoc_macro.c	2015/04/05 14:43:36	1.186
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.185 2015/04/02 22:48:17 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.186 2015/04/05 14:43:36 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -256,7 +256,9 @@ rew_last(struct mdoc *mdoc, const struct roff_node *to
 {
 	struct roff_node *n, *np;
 
-	assert(to);
+	if (to->flags & MDOC_VALID)
+		return;
+
 	mdoc->next = MDOC_NEXT_SIBLING;
 	while (mdoc->last != to) {
 		/*
@@ -625,10 +627,8 @@ blk_exp_close(MACRO_PROT_ARGS)
 	for (j = 0; ; j++) {
 		lastarg = *pos;
 
-		if (j == maxargs && n != NULL) {
-			rew_pending(mdoc, n);
-			n = NULL;
-		}
+		if (j == maxargs && n != NULL)
+			rew_last(mdoc, n);
 
 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
 		if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
@@ -643,10 +643,8 @@ blk_exp_close(MACRO_PROT_ARGS)
 			continue;
 		}
 
-		if (n != NULL) {
-			rew_pending(mdoc, n);
-			n = NULL;
-		}
+		if (n != NULL)
+			rew_last(mdoc, n);
 		mdoc->flags &= ~MDOC_NEWLINE;
 		mdoc_macro(mdoc, ntok, line, lastarg, pos, buf);
 		break;