diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 062691c9c6..401c59f9a1 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -2381,8 +2381,8 @@ IndexBuildHeapRangeScan(Relation heapRelation,
 				case HEAPTUPLE_INSERT_IN_PROGRESS:
 
 					/*
-					 * In "anyvisible" mode, this tuple is visible and we don't
-					 * need any further checks.
+					 * In "anyvisible" mode, this tuple is visible and we
+					 * don't need any further checks.
 					 */
 					if (anyvisible)
 					{
@@ -2437,8 +2437,8 @@ IndexBuildHeapRangeScan(Relation heapRelation,
 
 					/*
 					 * As with INSERT_IN_PROGRESS case, this is unexpected
-					 * unless it's our own deletion or a system catalog;
-					 * but in anyvisible mode, this tuple is visible.
+					 * unless it's our own deletion or a system catalog; but
+					 * in anyvisible mode, this tuple is visible.
 					 */
 					if (anyvisible)
 					{
@@ -2892,9 +2892,9 @@ validate_index(Oid heapId, Oid indexId, Snapshot snapshot)
 static inline int64
 itemptr_encode(ItemPointer itemptr)
 {
-	BlockNumber		block = ItemPointerGetBlockNumber(itemptr);
-	OffsetNumber	offset = ItemPointerGetOffsetNumber(itemptr);
-	int64			encoded;
+	BlockNumber block = ItemPointerGetBlockNumber(itemptr);
+	OffsetNumber offset = ItemPointerGetOffsetNumber(itemptr);
+	int64		encoded;
 
 	/*
 	 * Use the 16 least significant bits for the offset.  32 adjacent bits are
@@ -2913,8 +2913,8 @@ itemptr_encode(ItemPointer itemptr)
 static inline void
 itemptr_decode(ItemPointer itemptr, int64 encoded)
 {
-	BlockNumber		block = (BlockNumber) (encoded >> 16);
-	OffsetNumber	offset = (OffsetNumber) (encoded & 0xFFFF);
+	BlockNumber block = (BlockNumber) (encoded >> 16);
+	OffsetNumber offset = (OffsetNumber) (encoded & 0xFFFF);
 
 	ItemPointerSet(itemptr, block, offset);
 }
@@ -2960,7 +2960,7 @@ validate_index_heapscan(Relation heapRelation,
 
 	/* state variables for the merge */
 	ItemPointer indexcursor = NULL;
-	ItemPointerData		decoded;
+	ItemPointerData decoded;
 	bool		tuplesort_empty = false;
 
 	/*
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 459368e0fd..4e17fac6c1 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -228,9 +228,9 @@ cost_seqscan(Path *path, PlannerInfo *root,
 	/*
 	 * Primitive parallel cost model.  Assume the leader will do half as much
 	 * work as a regular worker, because it will also need to read the tuples
-	 * returned by the workers when they percolate up to the gather ndoe.
-	 * This is almost certainly not exactly the right way to model this, so
-	 * this will probably need to be changed at some point...
+	 * returned by the workers when they percolate up to the gather node. This
+	 * is almost certainly not exactly the right way to model this, so this
+	 * will probably need to be changed at some point...
 	 */
 	if (nworkers > 0)
 		run_cost = run_cost / (nworkers + 0.5);
diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index 5ad69ac876..71f4b5ef63 100644
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -122,10 +122,10 @@ typedef struct GISTSearchHeapItem
 {
 	ItemPointerData heapPtr;
 	bool		recheck;		/* T if quals must be rechecked */
-	bool		recheckDistances;	/* T if distances must be rechecked */
+	bool		recheckDistances;		/* T if distances must be rechecked */
 	IndexTuple	ftup;			/* data fetched back from the index, used in
 								 * index-only scans */
-	OffsetNumber	offnum;		/* track offset in page to mark tuple as
+	OffsetNumber offnum;		/* track offset in page to mark tuple as
 								 * LP_DEAD */
 } GISTSearchHeapItem;
 
@@ -165,10 +165,10 @@ typedef struct GISTScanOpaqueData
 	double	   *distances;		/* output area for gistindex_keytest */
 
 	/* info about killed items if any (killedItems is NULL if never used) */
-	OffsetNumber *killedItems;		/* offset numbers of killed items */
+	OffsetNumber *killedItems;	/* offset numbers of killed items */
 	int			numKilled;		/* number of currently stored items */
 	BlockNumber curBlkno;		/* current number of block */
-	GistNSN		curPageLSN;	/* pos in the WAL stream when page was read */
+	GistNSN		curPageLSN;		/* pos in the WAL stream when page was read */
 
 	/* In a non-ordered search, returnable heap items are stored here: */
 	GISTSearchHeapItem pageData[BLCKSZ / sizeof(IndexTupleData)];