diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 27de4d54ebfea7072d7a8f9f299155d83ad51dee..f05e0a0e1c93b784b9ee1c23bcbfd9890011ff8b 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.73 2000/08/08 15:42:59 tgl Exp $
+ * $Id: nodes.h,v 1.74 2000/08/11 23:46:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -145,7 +145,7 @@ typedef enum NodeTag
 	T_UpdateStmt,
 	T_SelectStmt,
 	T_AlterTableStmt,
-	T_AggregateStmt,
+	T_AggregateStmtXXX,			/* not used anymore; this tag# is available */
 	T_ChangeACLStmt,
 	T_ClosePortalStmt,
 	T_ClusterStmt,
@@ -216,7 +216,7 @@ typedef enum NodeTag
 	T_RangeTblEntry,
 	T_SortClause,
 	T_GroupClause,
-	T_SubSelect,
+	T_SubSelectXXX,				/* not used anymore; this tag# is available */
 	T_JoinExpr,
 	T_CaseExpr,
 	T_CaseWhen,
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 8516da8800eb378a0bce6fcb15aca39045e2e144..1d2a7ce813fe19d36c52ed18943ece1c6a473eb5 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.110 2000/07/15 00:01:38 tgl Exp $
+ * $Id: parsenodes.h,v 1.111 2000/08/11 23:46:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -490,8 +490,8 @@ typedef struct ProcedureStmt
 	Node	   *returnType;		/* the return type (as a string or a
 								 * TypeName (ie.setof) */
 	List	   *withClause;		/* a list of DefElem */
-	List	   *as;				/* the SQL statement or filename */
-	char	   *language;		/* C or SQL */
+	List	   *as;				/* definition of function body */
+	char	   *language;		/* C, SQL, etc */
 } ProcedureStmt;
 
 /* ----------------------
@@ -804,7 +804,7 @@ typedef struct DeleteStmt
 	NodeTag		type;
 	char	   *relname;		/* relation to delete from */
 	Node	   *whereClause;	/* qualifications */
-  bool        inh;              /* delete from subclasses */
+	bool		inh;			/* delete from subclasses */
 } DeleteStmt;
 
 /* ----------------------
@@ -818,7 +818,7 @@ typedef struct UpdateStmt
 	List	   *targetList;		/* the target list (of ResTarget) */
 	Node	   *whereClause;	/* qualifications */
 	List	   *fromClause;		/* the from clause */
-  bool        inh;              /* update subclasses */
+	bool		inh;			/* update subclasses */
 } UpdateStmt;
 
 /* ----------------------