 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat.c,v 1.136 2020/08/30 11:12:05 rillig Exp $	*/
+/*	$NetBSD: compat.c,v 1.137 2020/08/30 14:11:42 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.136 2020/08/30 11:12:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.137 2020/08/30 14:11:42 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: compat.c,v 1.136 2020/08/30 11:12:05 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.137 2020/08/30 14:11:42 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * compat.c --
  *	The routines in this file implement the full-compatibility
  *	mode of PMake. Most of the special functionality of PMake
  *	is available in this mode. Things not supported:
  *	    - different shells.
  *	    - friendly variable substitution.
+ *
  * Interface:
 @@ -519,27 +519,27 @@ Compat_Make(void *gnp, void *pgnp)
 	 * parent as well.
 	 */
 	gn->flags |= REMAKE;
 	gn->made = BEINGMADE;
 	if ((gn->type & OP_MADE) == 0)
 	    Suff_FindDeps(gn);
 	Lst_ForEach(gn->children, Compat_Make, gn);
 	if ((gn->flags & REMAKE) == 0) {
 	    gn->made = ABORTED;
 	    pgn->flags &= ~(unsigned)REMAKE;
 	    goto cohorts;
+	}
-	if (Lst_FindDatum(gn->iParents, pgn) != NULL) {
+	if (Lst_FindDatum(gn->implicitParents, pgn) != NULL) {
 	    char *p1;
 	    Var_Set(IMPSRC, Var_Value(TARGET, gn, &p1), pgn);
 	    bmake_free(p1);
+	}
 	/*
 	 * All the children were made ok. Now cmgn->mtime contains the
 	 * modification time of the newest child, we need to find out if we
 	 * exist and when we were modified last. The criteria for datedness
 	 * are defined by the Make_OODate function.
 	 */
 	if (DEBUG(MAKE)) {
 	    fprintf(debug_file, "Examining %s...", gn->name);
 @@ -623,27 +623,27 @@ Compat_Make(void *gnp, void *pgnp)
 	} else if (keepgoing) {
 	    pgn->flags &= ~(unsigned)REMAKE;
 	} else {
 	    PrintOnError(gn, "\nStop.");
 	    exit(1);
+	}
     } else if (gn->made == ERROR) {
 	/*
 	 * Already had an error when making this beastie. Tell the parent
 	 * to abort.
 	 */
 	pgn->flags &= ~(unsigned)REMAKE;
     } else {
-	if (Lst_FindDatum(gn->iParents, pgn) != NULL) {
+	if (Lst_FindDatum(gn->implicitParents, pgn) != NULL) {
 	    char *p1;
 	    const char *target = Var_Value(TARGET, gn, &p1);
 	    Var_Set(IMPSRC, target != NULL ? target : "", pgn);
 	    bmake_free(p1);
+	}
 	switch(gn->made) {
 	    case BEINGMADE:
 		Error("Graph cycles through %s", gn->name);
 		gn->made = ERROR;
 		pgn->flags &= ~(unsigned)REMAKE;
 		break;
 	    case MADE:
 		if ((gn->type & OP_EXEC) == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.126 2020/08/30 11:15:05 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.127 2020/08/30 14:11:42 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.126 2020/08/30 11:15:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.127 2020/08/30 14:11:42 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.126 2020/08/30 11:15:05 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.127 2020/08/30 14:11:42 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * dir.c --
  *	Directory searching using wildcards and/or normal names...
  *	Used both for source wildcarding in the Makefile and for finding
  *	implicit sources.
+ *
  * The interface for this module is:
  *	Dir_Init  	    Initialize the module.
+ *
 @@ -1424,27 +1424,27 @@ Dir_MTime(GNode *gn, Boolean recheck)
     struct stat stb;		/* buffer for finding the mod time */
     if (gn->type & OP_ARCHV) {
 	return Arch_MTime(gn);
     } else if (gn->type & OP_PHONY) {
 	gn->mtime = 0;
 	return 0;
     } else if (gn->path == NULL) {
 	if (gn->type & OP_NOPATH)
 	    fullName = NULL;
 	else {
 	    fullName = Dir_FindFile(gn->name, Suff_FindPath(gn));
 	    if (fullName == NULL && gn->flags & FROM_DEPEND &&
-		!Lst_IsEmpty(gn->iParents)) {
+		!Lst_IsEmpty(gn->implicitParents)) {
 		char *cp;
 		cp = strrchr(gn->name, '/');
 		if (cp) {
 		    /*
 		     * This is an implied source, and it may have moved,
 		     * see if we can find it via the current .PATH
 		     */
 		    cp++;
 		    fullName = Dir_FindFile(cp, Suff_FindPath(gn));
 		    if (fullName) {
 			/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.c,v 1.132 2020/08/30 11:15:05 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.133 2020/08/30 14:11:42 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.132 2020/08/30 11:15:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.133 2020/08/30 14:11:42 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: make.c,v 1.132 2020/08/30 11:15:05 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.133 2020/08/30 14:11:42 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * make.c --
  *	The functions which perform the examination of targets and
  *	their suitability for creation
+ *
  * Interface:
  *	Make_Run 	    	Initialize things for the module and recreate
  *	    	  	    	whatever needs recreating. Returns TRUE if
  *	    	    	    	work was (or would have been) done and FALSE
 @@ -685,27 +685,27 @@ Make_Recheck(GNode *gn)
  *	If the child wasn't made, the cmgn field of the parent will be
  *	altered if the child's mtime is big enough.
+ *
  *	Finally, if the child is the implied source for the parent, the
  *	parent's IMPSRC variable is set appropriately.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Make_Update(GNode *cgn)
+{
     GNode 	*pgn;	/* the parent node */
     const char	*cname;	/* the child's name */
-    LstNode	ln; 	/* Element in parents and iParents lists */
+    LstNode	ln; 	/* Element in parents and implicitParents lists */
     time_t	mtime = -1;
     char	*p1;
     Lst		parents;
     GNode	*centurion;
     /* It is save to re-examine any nodes again */
     checked++;
     cname = Var_Value(TARGET, cgn, &p1);
     bmake_free(p1);
     if (DEBUG(MAKE))
 	fprintf(debug_file, "Make_Update: %s%s\n", cgn->name, cgn->cohort_num);
 @@ -828,40 +828,40 @@ Make_Update(GNode *cgn)
 		    pgn->name, pgn->cohort_num, pgn->made);
 	    Targ_PrintNode(pgn, &two);
+	}
 	/* Ok, we can schedule the parent again */
 	pgn->made = REQUESTED;
 	Lst_Enqueue(toBeMade, pgn);
+    }
     Lst_Close(parents);
     /*
      * Set the .PREFIX and .IMPSRC variables for all the implied parents
      * of this node.
      */
-    Lst_Open(cgn->iParents);
+    Lst_Open(cgn->implicitParents);
+    {
 	const char *cpref = Var_Value(PREFIX, cgn, &p1);
-	while ((ln = Lst_Next(cgn->iParents)) != NULL) {
+	while ((ln = Lst_Next(cgn->implicitParents)) != NULL) {
 	    pgn = LstNode_Datum(ln);
 	    if (pgn->flags & REMAKE) {
 		Var_Set(IMPSRC, cname, pgn);
 		if (cpref != NULL)
 		    Var_Set(PREFIX, cpref, pgn);
+	    }
+	}
 	bmake_free(p1);
-	Lst_Close(cgn->iParents);
+	Lst_Close(cgn->implicitParents);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * MakeAddAllSrc --
  *	Add a child's name to the ALLSRC and OODATE variables of the given
  *	node. Called from Make_DoAllVar via Lst_ForEach. A child is added only
  *	if it has not been given the .EXEC, .USE or .INVISIBLE attributes.
  *	.EXEC and .USE children are very rarely going to be files, so...
  *	If the child is a .JOIN node, its ALLSRC is propagated to the parent.
+ *
  *	A child is added to the OODATE variable if its modification time is

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.132 2020/08/29 12:20:17 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.133 2020/08/30 14:11:42 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -283,29 +283,30 @@ typedef struct GNode {
     /* The type of operator used to define the sources (see the OP flags below).
      * XXX: This looks like a wild mixture of type and flags. */
     GNodeType type;
     /* whether it is involved in this invocation of make */
     GNodeFlags flags;
     /* The state of processing on this node */
     GNodeMade made;
     int unmade;			/* The number of unmade children */
     time_t mtime;		/* Its modification time */
     struct GNode *cmgn;		/* The youngest child */
-    /* Links to parents for which this is an implied source. May be empty.
+    /* The GNodes for which this node is an implied source. May be empty.
-     * Nodes that depend on this, as gleaned from the transformation rules. */
+     * For example, when there is an inference rule for .c.o, the node for
-    Lst iParents;
+     * file.c has the node for file.o in this list. */
     Lst implicitParents;
     /* Other nodes of the same name for the :: operator. */
     Lst cohorts;
     /* The nodes that depend on this one, or in other words, the nodes for
      * which this is a source. */
     Lst parents;
     /* The nodes on which this one depends. */
     Lst children;
     /* .ORDER nodes we need made. The nodes that must be made (if they're
      * made) before this node can be made, but that do not enter into the
      * datedness of this node. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.138 2020/08/30 11:15:05 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.139 2020/08/30 14:11:42 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.138 2020/08/30 11:15:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.139 2020/08/30 14:11:42 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.138 2020/08/30 11:15:05 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.139 2020/08/30 14:11:42 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * suff.c --
  *	Functions to maintain suffix lists and find implicit dependents
  *	using suffix transformation rules
+ *
  * Interface:
  *	Suff_Init 	    	Initialize all things to do with suffixes.
+ *
  *	Suff_End 	    	Cleanup the module
 @@ -1558,27 +1558,27 @@ SuffApplyTransform(GNode *tGn, GNode *sG
     /*
      * Deal with wildcards and variables in any acquired sources
      */
     for (ln = ln != NULL ? LstNode_Next(ln) : NULL; ln != NULL; ln = nln) {
 	nln = LstNode_Next(ln);
 	SuffExpandChildren(ln, tGn);
+    }
     /*
      * Keep track of another parent to which this beast is transformed so
      * the .IMPSRC variable can be set correctly for the parent.
      */
-    Lst_Append(sGn->iParents, tGn);
+    Lst_Append(sGn->implicitParents, tGn);
     return TRUE;
+}
 /* Locate dependencies for an OP_ARCHV node.
+ *
  * Input:
  *	gn		Node for which to locate dependencies
+ *
  * Side Effects:
  *	Same as Suff_FindDeps
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: targ.c,v 1.79 2020/08/30 11:15:05 rillig Exp $	*/
+/*	$NetBSD: targ.c,v 1.80 2020/08/30 14:11:42 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: targ.c,v 1.79 2020/08/30 11:15:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: targ.c,v 1.80 2020/08/30 14:11:42 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)targ.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: targ.c,v 1.79 2020/08/30 11:15:05 rillig Exp $");
+__RCSID("$NetBSD: targ.c,v 1.80 2020/08/30 14:11:42 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * targ.c --
  *	Functions for maintaining the Lst allTargets. Target nodes are
  *	kept in two structures: a Lst and a hash table.
+ *
  * Interface:
  *	Targ_Init 	    	Initialization procedure.
+ *
  *	Targ_End 	    	Cleanup the module
 @@ -195,27 +195,27 @@ Targ_NewGN(const char *name)
     gn->name = bmake_strdup(name);
     gn->uname = NULL;
     gn->path = NULL;
     gn->type = name[0] == '-' && name[1] == 'l' ? OP_LIB : 0;
     gn->unmade =    	0;
     gn->unmade_cohorts = 0;
     gn->cohort_num[0] = 0;
     gn->centurion =    	NULL;
     gn->made = 	    	UNMADE;
     gn->flags = 	0;
     gn->checked =	0;
     gn->mtime =		0;
     gn->cmgn =		NULL;
-    gn->iParents =  	Lst_Init();
+    gn->implicitParents = Lst_Init();
     gn->cohorts =   	Lst_Init();
     gn->parents =   	Lst_Init();
     gn->children =  	Lst_Init();
     gn->order_pred =  	Lst_Init();
     gn->order_succ =  	Lst_Init();
     Hash_InitTable(&gn->context, 0);
     gn->commands =  	Lst_Init();
     gn->suffix =	NULL;
     gn->fname = 	NULL;
     gn->lineno =	0;
 #ifdef CLEANUP
     if (allGNs == NULL)
 @@ -226,27 +226,27 @@ Targ_NewGN(const char *name)
     return gn;
+}
 #ifdef CLEANUP
 static void
 TargFreeGN(void *gnp)
+{
     GNode *gn = (GNode *)gnp;
     free(gn->name);
     free(gn->uname);
     free(gn->path);
-    Lst_Free(gn->iParents);
+    Lst_Free(gn->implicitParents);
     Lst_Free(gn->cohorts);
     Lst_Free(gn->parents);
     Lst_Free(gn->children);
     Lst_Free(gn->order_succ);
     Lst_Free(gn->order_pred);
     Hash_DeleteTable(&gn->context);
     Lst_Free(gn->commands);
     /* XXX: does gn->suffix need to be freed? It is reference-counted. */
     /* gn->fname points to name allocated when file was opened, don't free */
     free(gn);
+}
 @@ -479,29 +479,29 @@ Targ_PrintNode(void *gnp, void *passp)
+	    }
 	    if (! (gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC))) {
 		if (gn->mtime != 0) {
 		    fprintf(debug_file, "# last modified %s: %s\n",
 			      Targ_FmtTime(gn->mtime),
 			      made_name(gn->made));
 		} else if (gn->made != UNMADE) {
 		    fprintf(debug_file, "# non-existent (maybe): %s\n",
 			      made_name(gn->made));
 		} else {
 		    fprintf(debug_file, "# unmade\n");
+		}
+	    }
-	    if (!Lst_IsEmpty(gn->iParents)) {
+	    if (!Lst_IsEmpty(gn->implicitParents)) {
 		fprintf(debug_file, "# implicit parents: ");
-		Lst_ForEach(gn->iParents, TargPrintName, NULL);
+		Lst_ForEach(gn->implicitParents, TargPrintName, NULL);
 		fprintf(debug_file, "\n");
+	    }
 	} else {
 	    if (gn->unmade)
 		fprintf(debug_file, "# %d unmade children\n", gn->unmade);
+	}
 	if (!Lst_IsEmpty(gn->parents)) {
 	    fprintf(debug_file, "# parents: ");
 	    Lst_ForEach(gn->parents, TargPrintName, NULL);
 	    fprintf(debug_file, "\n");
+	}
 	if (!Lst_IsEmpty(gn->order_pred)) {
 	    fprintf(debug_file, "# order_pred: ");