===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.198
retrieving revision 1.201
diff -u -p -r1.198 -r1.201
--- mandoc/mdoc_macro.c	2015/05/01 15:27:54	1.198
+++ mandoc/mdoc_macro.c	2015/09/26 00:54:04	1.201
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.198 2015/05/01 15:27:54 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.201 2015/09/26 00:54:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -258,12 +258,11 @@ lookup(struct roff_man *mdoc, int from, int line, int 
 static void
 rew_last(struct roff_man *mdoc, const struct roff_node *to)
 {
-	struct roff_node *n, *np;
+	struct roff_node	*np;
 
 	if (to->flags & MDOC_VALID)
 		return;
 
-	mdoc->next = ROFF_NEXT_SIBLING;
 	while (mdoc->last != to) {
 		/*
 		 * Save the parent here, because we may delete the
@@ -273,11 +272,10 @@ rew_last(struct roff_man *mdoc, const struct roff_node
 		 */
 		np = mdoc->last->parent;
 		mdoc_valid_post(mdoc);
-		n = mdoc->last;
 		mdoc->last = np;
 		assert(mdoc->last);
-		mdoc->last->last = n;
 	}
+	mdoc->next = ROFF_NEXT_SIBLING;
 	mdoc_valid_post(mdoc);
 }
 
@@ -365,7 +363,6 @@ rew_alt(int tok)
 	default:
 		return(tok);
 	}
-	/* NOTREACHED */
 }
 
 static void