diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index e67f0e3509b..399c1812d40 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -349,10 +349,10 @@ set_plan_references(PlannerInfo *root, Plan *plan)
 	}
 
 	/* Also fix up the information in PartitionPruneInfos. */
-	foreach (lc, root->partPruneInfos)
+	foreach(lc, root->partPruneInfos)
 	{
 		PartitionPruneInfo *pruneinfo = lfirst(lc);
-		ListCell  *l;
+		ListCell   *l;
 
 		pruneinfo->root_parent_relids =
 			offset_relid_set(pruneinfo->root_parent_relids, rtoffset);
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index db21cf3c355..48858a871af 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -5416,7 +5416,7 @@ examine_simple_variable(PlannerInfo *root, Var *var,
 			 * onerel->userid if it's set, in case we're accessing the table
 			 * via a view.
 			 */
-			userid = OidIsValid(onerel->userid) ?  onerel->userid : GetUserId();
+			userid = OidIsValid(onerel->userid) ? onerel->userid : GetUserId();
 
 			vardata->acl_ok =
 				rte->securityQuals == NIL &&
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 6112cd85c84..f17846e30e2 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -95,8 +95,8 @@ typedef uint64 AclMode;			/* a bitmask of privilege bits */
 #define ACL_CONNECT		(1<<11) /* for databases */
 #define ACL_SET			(1<<12) /* for configuration parameters */
 #define ACL_ALTER_SYSTEM (1<<13)	/* for configuration parameters */
-#define ACL_VACUUM		(1<<14)	/* for relations */
-#define ACL_ANALYZE		(1<<15)	/* for relations */
+#define ACL_VACUUM		(1<<14) /* for relations */
+#define ACL_ANALYZE		(1<<15) /* for relations */
 #define N_ACL_RIGHTS	16		/* 1 plus the last 1<<x */
 #define ACL_NO_RIGHTS	0
 /* Currently, SELECT ... FOR [KEY] UPDATE/SHARE requires UPDATE privileges */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 2e202892a71..c36a15bd09d 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -70,8 +70,8 @@ typedef struct PlannedStmt
 
 	struct Plan *planTree;		/* tree of Plan nodes */
 
-	List	   *partPruneInfos;	/* List of PartitionPruneInfo contained in
-								 * the plan */
+	List	   *partPruneInfos; /* List of PartitionPruneInfo contained in the
+								 * plan */
 
 	List	   *rtable;			/* list of RangeTblEntry nodes */