diff --git a/contrib/pg_plan_advice/pgpa_planner.c b/contrib/pg_plan_advice/pgpa_planner.c
index afa9587a725..b25f62b2e87 100644
--- a/contrib/pg_plan_advice/pgpa_planner.c
+++ b/contrib/pg_plan_advice/pgpa_planner.c
@@ -2100,10 +2100,10 @@ pgpa_compute_rt_offsets(pgpa_planner_state *pps, PlannedStmt *pstmt)
 				if (rtinfo->dummy)
 				{
 					/*
-					 * It will not be possible to make any effective use of the
-					 * sj_unique_rels list in this case, and it also won't be
-					 * important to do so. So just throw the list away to avoid
-					 * confusing pgpa_plan_walker.
+					 * It will not be possible to make any effective use of
+					 * the sj_unique_rels list in this case, and it also won't
+					 * be important to do so. So just throw the list away to
+					 * avoid confusing pgpa_plan_walker.
 					 */
 					proot->sj_unique_rels = NIL;
 					break;
diff --git a/contrib/pg_plan_advice/pgpa_planner.h b/contrib/pg_plan_advice/pgpa_planner.h
index 93fda2055b2..32808b26594 100644
--- a/contrib/pg_plan_advice/pgpa_planner.h
+++ b/contrib/pg_plan_advice/pgpa_planner.h
@@ -42,12 +42,12 @@ typedef struct pgpa_planner_info
 
 	/*
 	 * If has_rtoffset is true, then rtoffset is the offset required to align
-	 * RTIs for this query level with RTIs from the final, flattened rangetable.
-	 * If has_rtoffset is false, then this subquery's range table wasn't copied,
-	 * or was only partially copied, into the final range table. (Note that
-	 * we can't determine the rtoffset values until the final range table
-	 * actually exists; before that time, has_rtoffset will be false everywhere
-	 * except at the top level.)
+	 * RTIs for this query level with RTIs from the final, flattened
+	 * rangetable. If has_rtoffset is false, then this subquery's range table
+	 * wasn't copied, or was only partially copied, into the final range
+	 * table. (Note that we can't determine the rtoffset values until the
+	 * final range table actually exists; before that time, has_rtoffset will
+	 * be false everywhere except at the top level.)
 	 */
 	bool		has_rtoffset;
 	Index		rtoffset;
diff --git a/contrib/pg_plan_advice/pgpa_walker.c b/contrib/pg_plan_advice/pgpa_walker.c
index 0a4512d4921..e32684d2075 100644
--- a/contrib/pg_plan_advice/pgpa_walker.c
+++ b/contrib/pg_plan_advice/pgpa_walker.c
@@ -722,8 +722,8 @@ pgpa_walker_would_advise(pgpa_plan_walker_context *walker,
 
 	/*
 	 * DO_NOT_SCAN advice targets rels that may not be in the flat range table
-	 * (e.g. MinMaxAgg losers), so we can't use pgpa_compute_rti_from_identifier.
-	 * Instead, check directly against the do_not_scan_identifiers list.
+	 * (e.g. MinMaxAgg losers), so pgpa_compute_rti_from_identifier won't work
+	 * here. Instead, check directly against the do_not_scan_identifiers list.
 	 */
 	if (tag == PGPA_TAG_DO_NOT_SCAN)
 	{
diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index 96ec3227262..7947d83d584 100644
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -324,8 +324,8 @@ struct PlannerInfo
 	 * If this PlannerInfo exists to consider an alternative implementation
 	 * strategy for a portion of the query that could also be implemented by
 	 * some other PlannerInfo, this is the plan_name for that other
-	 * PlannerInfo. When we are considering the first or only alternative,
-	 * it is the same as plan_name.
+	 * PlannerInfo. When we are considering the first or only alternative, it
+	 * is the same as plan_name.
 	 *
 	 * Currently, we set this to a value other than plan_name only when
 	 * considering a MinMaxAggPath or a hashed SubPlan.