Initial pgindent and pgperltidy run for v14.

Also "make reformat-dat-files".

The only change worthy of note is that pgindent messed up the formatting
of launcher.c's struct LogicalRepWorkerId, which led me to notice that
that struct wasn't used at all anymore, so I just took it out.

35 files changed, 509 insertions, 509 deletions

diff --git a/src/include/access/brin_tuple.h b/src/include/access/brin_tuple.h
index 87de94f397..c80341f4d6 100644
--- a/src/include/access/brin_tuple.h
+++ b/src/include/access/brin_tuple.h
@@ -33,7 +33,7 @@ typedef struct BrinValues
 	bool		bv_allnulls;	/* are all values nulls in the page range? */
 	Datum	   *bv_values;		/* current accumulated values */
 	Datum		bv_mem_value;	/* expanded accumulated values */
-	MemoryContext	bv_context;
+	MemoryContext bv_context;
 	brin_serialize_callback_type bv_serialize;
 } BrinValues;
 
diff --git a/src/include/access/commit_ts.h b/src/include/access/commit_ts.h
index 608a1643cd..e045dd416f 100644
--- a/src/include/access/commit_ts.h
+++ b/src/include/access/commit_ts.h
@@ -57,7 +57,7 @@ typedef struct xl_commit_ts_set
 	RepOriginId nodeid;
 	TransactionId mainxid;
 	/* subxact Xids follow */
-} xl_commit_ts_set;
+}			xl_commit_ts_set;
 
 #define SizeOfCommitTsSet	(offsetof(xl_commit_ts_set, mainxid) + \
 							 sizeof(TransactionId))
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index a645c42e68..42c66fac57 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -1086,7 +1086,7 @@ typedef struct BTOptions
 {
 	int32		varlena_header_;	/* varlena header (do not touch directly!) */
 	int			fillfactor;		/* page fill factor in percent (0..100) */
-	float8		vacuum_cleanup_index_scale_factor; /* deprecated */
+	float8		vacuum_cleanup_index_scale_factor;	/* deprecated */
 	bool		deduplicate_items;	/* Try to deduplicate items? */
 } BTOptions;
 
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 17a161c69a..74a07ef152 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -93,7 +93,7 @@ typedef struct ParallelBlockTableScanWorkerData
 	uint32		phsw_chunk_remaining;	/* # blocks left in this chunk */
 	uint32		phsw_chunk_size;	/* The number of blocks to allocate in
 									 * each I/O chunk for the scan */
-}			ParallelBlockTableScanWorkerData;
+} ParallelBlockTableScanWorkerData;
 typedef struct ParallelBlockTableScanWorkerData *ParallelBlockTableScanWorker;
 
 /*
diff --git a/src/include/access/toast_compression.h b/src/include/access/toast_compression.h
index 46c2544e31..9e2c1cbe1a 100644
--- a/src/include/access/toast_compression.h
+++ b/src/include/access/toast_compression.h
@@ -20,7 +20,7 @@
  * but the value is one of the char values defined below, as they appear in
  * pg_attribute.attcompression, e.g. TOAST_PGLZ_COMPRESSION.
  */
-extern int default_toast_compression;
+extern int	default_toast_compression;
 
 /*
  * Built-in compression method-id.  The toast compression header will store
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 2f7338ee82..05c6fbffe4 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -238,7 +238,7 @@ typedef struct VariableCacheData
 	 * GetSnapshotData() needs to recompute the contents of the snapshot, or
 	 * not. There are likely other users of this.  Always above 1.
 	 */
-	uint64 xactCompletionCount;
+	uint64		xactCompletionCount;
 
 	/*
 	 * These fields are protected by XactTruncationLock
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index f49a57b35e..134f6862da 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -72,8 +72,8 @@ typedef enum
 	SYNCHRONOUS_COMMIT_REMOTE_WRITE,	/* wait for local flush and remote
 										 * write */
 	SYNCHRONOUS_COMMIT_REMOTE_FLUSH,	/* wait for local and remote flush */
-	SYNCHRONOUS_COMMIT_REMOTE_APPLY /* wait for local and remote flush
-									   and remote apply */
+	SYNCHRONOUS_COMMIT_REMOTE_APPLY /* wait for local and remote flush and
+									 * remote apply */
 }			SyncCommitLevel;
 
 /* Define the default setting for synchronous_commit */
diff --git a/src/include/catalog/pg_aggregate.dat b/src/include/catalog/pg_aggregate.dat
index 0d8c5a922a..fc6d3bfd94 100644
--- a/src/include/catalog/pg_aggregate.dat
+++ b/src/include/catalog/pg_aggregate.dat
@@ -505,20 +505,20 @@
   aggcombinefn => 'int2and', aggtranstype => 'int2' },
 { aggfnoid => 'bit_or(int2)', aggtransfn => 'int2or', aggcombinefn => 'int2or',
   aggtranstype => 'int2' },
-{ aggfnoid => 'bit_xor(int2)', aggtransfn => 'int2xor', aggcombinefn => 'int2xor',
-  aggtranstype => 'int2' },
+{ aggfnoid => 'bit_xor(int2)', aggtransfn => 'int2xor',
+  aggcombinefn => 'int2xor', aggtranstype => 'int2' },
 { aggfnoid => 'bit_and(int4)', aggtransfn => 'int4and',
   aggcombinefn => 'int4and', aggtranstype => 'int4' },
 { aggfnoid => 'bit_or(int4)', aggtransfn => 'int4or', aggcombinefn => 'int4or',
   aggtranstype => 'int4' },
-{ aggfnoid => 'bit_xor(int4)', aggtransfn => 'int4xor', aggcombinefn => 'int4xor',
-  aggtranstype => 'int4' },
+{ aggfnoid => 'bit_xor(int4)', aggtransfn => 'int4xor',
+  aggcombinefn => 'int4xor', aggtranstype => 'int4' },
 { aggfnoid => 'bit_and(int8)', aggtransfn => 'int8and',
   aggcombinefn => 'int8and', aggtranstype => 'int8' },
 { aggfnoid => 'bit_or(int8)', aggtransfn => 'int8or', aggcombinefn => 'int8or',
   aggtranstype => 'int8' },
-{ aggfnoid => 'bit_xor(int8)', aggtransfn => 'int8xor', aggcombinefn => 'int8xor',
-  aggtranstype => 'int8' },
+{ aggfnoid => 'bit_xor(int8)', aggtransfn => 'int8xor',
+  aggcombinefn => 'int8xor', aggtranstype => 'int8' },
 { aggfnoid => 'bit_and(bit)', aggtransfn => 'bitand', aggcombinefn => 'bitand',
   aggtranstype => 'bit' },
 { aggfnoid => 'bit_or(bit)', aggtransfn => 'bitor', aggcombinefn => 'bitor',
diff --git a/src/include/catalog/pg_amproc.dat b/src/include/catalog/pg_amproc.dat
index 7fedf78099..5460aa2422 100644
--- a/src/include/catalog/pg_amproc.dat
+++ b/src/include/catalog/pg_amproc.dat
@@ -838,8 +838,7 @@
 
 # bloom "char"
 { amprocfamily => 'brin/char_bloom_ops', amproclefttype => 'char',
-  amprocrighttype => 'char', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'char', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/char_bloom_ops', amproclefttype => 'char',
   amprocrighttype => 'char', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -849,8 +848,7 @@
 { amprocfamily => 'brin/char_bloom_ops', amproclefttype => 'char',
   amprocrighttype => 'char', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/char_bloom_ops', amproclefttype => 'char',
-  amprocrighttype => 'char', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'char', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/char_bloom_ops', amproclefttype => 'char',
   amprocrighttype => 'char', amprocnum => '11', amproc => 'hashchar' },
 
@@ -869,8 +867,7 @@
 
 # bloom name
 { amprocfamily => 'brin/name_bloom_ops', amproclefttype => 'name',
-  amprocrighttype => 'name', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'name', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/name_bloom_ops', amproclefttype => 'name',
   amprocrighttype => 'name', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -880,8 +877,7 @@
 { amprocfamily => 'brin/name_bloom_ops', amproclefttype => 'name',
   amprocrighttype => 'name', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/name_bloom_ops', amproclefttype => 'name',
-  amprocrighttype => 'name', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'name', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/name_bloom_ops', amproclefttype => 'name',
   amprocrighttype => 'name', amprocnum => '11', amproc => 'hashname' },
 
@@ -933,12 +929,14 @@
   amprocrighttype => 'int2', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int2',
-  amprocrighttype => 'int2', amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+  amprocrighttype => 'int2', amprocnum => '4',
+  amproc => 'brin_minmax_multi_union' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int2',
   amprocrighttype => 'int2', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int2',
-  amprocrighttype => 'int2', amprocnum => '11', amproc => 'brin_minmax_multi_distance_int2' },
+  amprocrighttype => 'int2', amprocnum => '11',
+  amproc => 'brin_minmax_multi_distance_int2' },
 
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int4',
   amprocrighttype => 'int4', amprocnum => '1',
@@ -950,12 +948,14 @@
   amprocrighttype => 'int4', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int4',
-  amprocrighttype => 'int4', amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+  amprocrighttype => 'int4', amprocnum => '4',
+  amproc => 'brin_minmax_multi_union' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int4',
   amprocrighttype => 'int4', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int4',
-  amprocrighttype => 'int4', amprocnum => '11', amproc => 'brin_minmax_multi_distance_int4' },
+  amprocrighttype => 'int4', amprocnum => '11',
+  amproc => 'brin_minmax_multi_distance_int4' },
 
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int8',
   amprocrighttype => 'int8', amprocnum => '1',
@@ -967,17 +967,18 @@
   amprocrighttype => 'int8', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int8',
-  amprocrighttype => 'int8', amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+  amprocrighttype => 'int8', amprocnum => '4',
+  amproc => 'brin_minmax_multi_union' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int8',
   amprocrighttype => 'int8', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
 { amprocfamily => 'brin/integer_minmax_multi_ops', amproclefttype => 'int8',
-  amprocrighttype => 'int8', amprocnum => '11', amproc => 'brin_minmax_multi_distance_int8' },
+  amprocrighttype => 'int8', amprocnum => '11',
+  amproc => 'brin_minmax_multi_distance_int8' },
 
 # bloom integer: int2, int4, int8
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int8',
-  amprocrighttype => 'int8', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'int8', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int8',
   amprocrighttype => 'int8', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -987,14 +988,12 @@
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int8',
   amprocrighttype => 'int8', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int8',
-  amprocrighttype => 'int8', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'int8', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int8',
   amprocrighttype => 'int8', amprocnum => '11', amproc => 'hashint8' },
 
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int2',
-  amprocrighttype => 'int2', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'int2', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int2',
   amprocrighttype => 'int2', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -1004,14 +1003,12 @@
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int2',
   amprocrighttype => 'int2', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int2',
-  amprocrighttype => 'int2', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'int2', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int2',
   amprocrighttype => 'int2', amprocnum => '11', amproc => 'hashint2' },
 
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int4',
-  amprocrighttype => 'int4', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'int4', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int4',
   amprocrighttype => 'int4', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -1021,8 +1018,7 @@
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int4',
   amprocrighttype => 'int4', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int4',
-  amprocrighttype => 'int4', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'int4', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/integer_bloom_ops', amproclefttype => 'int4',
   amprocrighttype => 'int4', amprocnum => '11', amproc => 'hashint4' },
 
@@ -1041,8 +1037,7 @@
 
 # bloom text
 { amprocfamily => 'brin/text_bloom_ops', amproclefttype => 'text',
-  amprocrighttype => 'text', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'text', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/text_bloom_ops', amproclefttype => 'text',
   amprocrighttype => 'text', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -1052,8 +1047,7 @@
 { amprocfamily => 'brin/text_bloom_ops', amproclefttype => 'text',
   amprocrighttype => 'text', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/text_bloom_ops', amproclefttype => 'text',
-  amprocrighttype => 'text', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'text', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/text_bloom_ops', amproclefttype => 'text',
   amprocrighttype => 'text', amprocnum => '11', amproc => 'hashtext' },
 
@@ -1071,7 +1065,8 @@
 
 # minmax multi oid
 { amprocfamily => 'brin/oid_minmax_multi_ops', amproclefttype => 'oid',
-  amprocrighttype => 'oid', amprocnum => '1', amproc => 'brin_minmax_multi_opcinfo' },
+  amprocrighttype => 'oid', amprocnum => '1',
+  amproc => 'brin_minmax_multi_opcinfo' },
 { amprocfamily => 'brin/oid_minmax_multi_ops', amproclefttype => 'oid',
   amprocrighttype => 'oid', amprocnum => '2',
   amproc => 'brin_minmax_multi_add_value' },
@@ -1079,12 +1074,14 @@
   amprocrighttype => 'oid', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
 { amprocfamily => 'brin/oid_minmax_multi_ops', amproclefttype => 'oid',
-  amprocrighttype => 'oid', amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+  amprocrighttype => 'oid', amprocnum => '4',
+  amproc => 'brin_minmax_multi_union' },
 { amprocfamily => 'brin/oid_minmax_multi_ops', amproclefttype => 'oid',
   amprocrighttype => 'oid', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
 { amprocfamily => 'brin/oid_minmax_multi_ops', amproclefttype => 'oid',
-  amprocrighttype => 'oid', amprocnum => '11', amproc => 'brin_minmax_multi_distance_int4' },
+  amprocrighttype => 'oid', amprocnum => '11',
+  amproc => 'brin_minmax_multi_distance_int4' },
 
 # bloom oid
 { amprocfamily => 'brin/oid_bloom_ops', amproclefttype => 'oid',
@@ -1098,8 +1095,7 @@
 { amprocfamily => 'brin/oid_bloom_ops', amproclefttype => 'oid',
   amprocrighttype => 'oid', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/oid_bloom_ops', amproclefttype => 'oid',
-  amprocrighttype => 'oid', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'oid', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/oid_bloom_ops', amproclefttype => 'oid',
   amprocrighttype => 'oid', amprocnum => '11', amproc => 'hashoid' },
 
@@ -1127,14 +1123,14 @@
 { amprocfamily => 'brin/tid_bloom_ops', amproclefttype => 'tid',
   amprocrighttype => 'tid', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/tid_bloom_ops', amproclefttype => 'tid',
-  amprocrighttype => 'tid', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'tid', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/tid_bloom_ops', amproclefttype => 'tid',
   amprocrighttype => 'tid', amprocnum => '11', amproc => 'hashtid' },
 
 # minmax multi tid
 { amprocfamily => 'brin/tid_minmax_multi_ops', amproclefttype => 'tid',
-  amprocrighttype => 'tid', amprocnum => '1', amproc => 'brin_minmax_multi_opcinfo' },
+  amprocrighttype => 'tid', amprocnum => '1',
+  amproc => 'brin_minmax_multi_opcinfo' },
 { amprocfamily => 'brin/tid_minmax_multi_ops', amproclefttype => 'tid',
   amprocrighttype => 'tid', amprocnum => '2',
   amproc => 'brin_minmax_multi_add_value' },
@@ -1142,12 +1138,14 @@
   amprocrighttype => 'tid', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
 { amprocfamily => 'brin/tid_minmax_multi_ops', amproclefttype => 'tid',
-  amprocrighttype => 'tid', amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+  amprocrighttype => 'tid', amprocnum => '4',
+  amproc => 'brin_minmax_multi_union' },
 { amprocfamily => 'brin/tid_minmax_multi_ops', amproclefttype => 'tid',
   amprocrighttype => 'tid', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
 { amprocfamily => 'brin/tid_minmax_multi_ops', amproclefttype => 'tid',
-  amprocrighttype => 'tid', amprocnum => '11', amproc => 'brin_minmax_multi_distance_tid' },
+  amprocrighttype => 'tid', amprocnum => '11',
+  amproc => 'brin_minmax_multi_distance_tid' },
 
 # minmax float
 { amprocfamily => 'brin/float_minmax_ops', amproclefttype => 'float4',
@@ -1226,14 +1224,12 @@
   amprocrighttype => 'float4', amprocnum => '3',
   amproc => 'brin_bloom_consistent' },
 { amprocfamily => 'brin/float_bloom_ops', amproclefttype => 'float4',
-  amprocrighttype => 'float4', amprocnum => '4',
-  amproc => 'brin_bloom_union' },
+  amprocrighttype => 'float4', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/float_bloom_ops', amproclefttype => 'float4',
   amprocrighttype => 'float4', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/float_bloom_ops', amproclefttype => 'float4',
-  amprocrighttype => 'float4', amprocnum => '11',
-  amproc => 'hashfloat4' },
+  amprocrighttype => 'float4', amprocnum => '11', amproc => 'hashfloat4' },
 
 { amprocfamily => 'brin/float_bloom_ops', amproclefttype => 'float8',
   amprocrighttype => 'float8', amprocnum => '1',
@@ -1245,14 +1241,12 @@
   amprocrighttype => 'float8', amprocnum => '3',
   amproc => 'brin_bloom_consistent' },
 { amprocfamily => 'brin/float_bloom_ops', amproclefttype => 'float8',
-  amprocrighttype => 'float8', amprocnum => '4',
-  amproc => 'brin_bloom_union' },
+  amprocrighttype => 'float8', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/float_bloom_ops', amproclefttype => 'float8',
   amprocrighttype => 'float8', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/float_bloom_ops', amproclefttype => 'float8',
-  amprocrighttype => 'float8', amprocnum => '11',
-  amproc => 'hashfloat8' },
+  amprocrighttype => 'float8', amprocnum => '11', amproc => 'hashfloat8' },
 
 # minmax macaddr
 { amprocfamily => 'brin/macaddr_minmax_ops', amproclefttype => 'macaddr',
@@ -1305,8 +1299,7 @@
   amprocrighttype => 'macaddr', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/macaddr_bloom_ops', amproclefttype => 'macaddr',
-  amprocrighttype => 'macaddr', amprocnum => '11',
-  amproc => 'hashmacaddr' },
+  amprocrighttype => 'macaddr', amprocnum => '11', amproc => 'hashmacaddr' },
 
 # minmax macaddr8
 { amprocfamily => 'brin/macaddr8_minmax_ops', amproclefttype => 'macaddr8',
@@ -1323,24 +1316,24 @@
   amproc => 'brin_minmax_union' },
 
 # minmax multi macaddr8
-{ amprocfamily => 'brin/macaddr8_minmax_multi_ops', amproclefttype => 'macaddr8',
-  amprocrighttype => 'macaddr8', amprocnum => '1',
+{ amprocfamily => 'brin/macaddr8_minmax_multi_ops',
+  amproclefttype => 'macaddr8', amprocrighttype => 'macaddr8', amprocnum => '1',
   amproc => 'brin_minmax_multi_opcinfo' },
-{ amprocfamily => 'brin/macaddr8_minmax_multi_ops', amproclefttype => 'macaddr8',
-  amprocrighttype => 'macaddr8', amprocnum => '2',
+{ amprocfamily => 'brin/macaddr8_minmax_multi_ops',
+  amproclefttype => 'macaddr8', amprocrighttype => 'macaddr8', amprocnum => '2',
   amproc => 'brin_minmax_multi_add_value' },
-{ amprocfamily => 'brin/macaddr8_minmax_multi_ops', amproclefttype => 'macaddr8',
-  amprocrighttype => 'macaddr8', amprocnum => '3',
+{ amprocfamily => 'brin/macaddr8_minmax_multi_ops',
+  amproclefttype => 'macaddr8', amprocrighttype => 'macaddr8', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
-{ amprocfamily => 'brin/macaddr8_minmax_multi_ops', amproclefttype => 'macaddr8',
-  amprocrighttype => 'macaddr8', amprocnum => '4',
+{ amprocfamily => 'brin/macaddr8_minmax_multi_ops',
+  amproclefttype => 'macaddr8', amprocrighttype => 'macaddr8', amprocnum => '4',
   amproc => 'brin_minmax_multi_union' },
-{ amprocfamily => 'brin/macaddr8_minmax_multi_ops', amproclefttype => 'macaddr8',
-  amprocrighttype => 'macaddr8', amprocnum => '5',
+{ amprocfamily => 'brin/macaddr8_minmax_multi_ops',
+  amproclefttype => 'macaddr8', amprocrighttype => 'macaddr8', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
-{ amprocfamily => 'brin/macaddr8_minmax_multi_ops', amproclefttype => 'macaddr8',
-  amprocrighttype => 'macaddr8', amprocnum => '11',
-  amproc => 'brin_minmax_multi_distance_macaddr8' },
+{ amprocfamily => 'brin/macaddr8_minmax_multi_ops',
+  amproclefttype => 'macaddr8', amprocrighttype => 'macaddr8',
+  amprocnum => '11', amproc => 'brin_minmax_multi_distance_macaddr8' },
 
 # bloom macaddr8
 { amprocfamily => 'brin/macaddr8_bloom_ops', amproclefttype => 'macaddr8',
@@ -1359,8 +1352,7 @@
   amprocrighttype => 'macaddr8', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/macaddr8_bloom_ops', amproclefttype => 'macaddr8',
-  amprocrighttype => 'macaddr8', amprocnum => '11',
-  amproc => 'hashmacaddr8' },
+  amprocrighttype => 'macaddr8', amprocnum => '11', amproc => 'hashmacaddr8' },
 
 # minmax inet
 { amprocfamily => 'brin/network_minmax_ops', amproclefttype => 'inet',
@@ -1397,8 +1389,7 @@
 
 # bloom inet
 { amprocfamily => 'brin/network_bloom_ops', amproclefttype => 'inet',
-  amprocrighttype => 'inet', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'inet', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/network_bloom_ops', amproclefttype => 'inet',
   amprocrighttype => 'inet', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -1408,8 +1399,7 @@
 { amprocfamily => 'brin/network_bloom_ops', amproclefttype => 'inet',
   amprocrighttype => 'inet', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/network_bloom_ops', amproclefttype => 'inet',
-  amprocrighttype => 'inet', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'inet', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/network_bloom_ops', amproclefttype => 'inet',
   amprocrighttype => 'inet', amprocnum => '11', amproc => 'hashinet' },
 
@@ -1458,14 +1448,12 @@
   amprocrighttype => 'bpchar', amprocnum => '3',
   amproc => 'brin_bloom_consistent' },
 { amprocfamily => 'brin/bpchar_bloom_ops', amproclefttype => 'bpchar',
-  amprocrighttype => 'bpchar', amprocnum => '4',
-  amproc => 'brin_bloom_union' },
+  amprocrighttype => 'bpchar', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/bpchar_bloom_ops', amproclefttype => 'bpchar',
   amprocrighttype => 'bpchar', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/bpchar_bloom_ops', amproclefttype => 'bpchar',
-  amprocrighttype => 'bpchar', amprocnum => '11',
-  amproc => 'hashbpchar' },
+  amprocrighttype => 'bpchar', amprocnum => '11', amproc => 'hashbpchar' },
 
 # minmax time without time zone
 { amprocfamily => 'brin/time_minmax_ops', amproclefttype => 'time',
@@ -1491,7 +1479,8 @@
   amprocrighttype => 'time', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
 { amprocfamily => 'brin/time_minmax_multi_ops', amproclefttype => 'time',
-  amprocrighttype => 'time', amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+  amprocrighttype => 'time', amprocnum => '4',
+  amproc => 'brin_minmax_multi_union' },
 { amprocfamily => 'brin/time_minmax_multi_ops', amproclefttype => 'time',
   amprocrighttype => 'time', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
@@ -1501,8 +1490,7 @@
 
 # bloom time without time zone
 { amprocfamily => 'brin/time_bloom_ops', amproclefttype => 'time',
-  amprocrighttype => 'time', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'time', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/time_bloom_ops', amproclefttype => 'time',
   amprocrighttype => 'time', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -1512,8 +1500,7 @@
 { amprocfamily => 'brin/time_bloom_ops', amproclefttype => 'time',
   amprocrighttype => 'time', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/time_bloom_ops', amproclefttype => 'time',
-  amprocrighttype => 'time', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'time', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/time_bloom_ops', amproclefttype => 'time',
   amprocrighttype => 'time', amprocnum => '11', amproc => 'time_hash' },
 
@@ -1557,43 +1544,43 @@
   amprocrighttype => 'date', amprocnum => '4', amproc => 'brin_minmax_union' },
 
 # minmax multi datetime (date, timestamp, timestamptz)
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamp',
-  amprocrighttype => 'timestamp', amprocnum => '1',
-  amproc => 'brin_minmax_multi_opcinfo' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamp',
-  amprocrighttype => 'timestamp', amprocnum => '2',
-  amproc => 'brin_minmax_multi_add_value' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamp',
-  amprocrighttype => 'timestamp', amprocnum => '3',
-  amproc => 'brin_minmax_multi_consistent' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamp',
-  amprocrighttype => 'timestamp', amprocnum => '4',
-  amproc => 'brin_minmax_multi_union' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamp',
-  amprocrighttype => 'timestamp', amprocnum => '5',
-  amproc => 'brin_minmax_multi_options' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamp',
-  amprocrighttype => 'timestamp', amprocnum => '11',
-  amproc => 'brin_minmax_multi_distance_timestamp' },
-
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamptz',
-  amprocrighttype => 'timestamptz', amprocnum => '1',
-  amproc => 'brin_minmax_multi_opcinfo' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamptz',
-  amprocrighttype => 'timestamptz', amprocnum => '2',
-  amproc => 'brin_minmax_multi_add_value' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamptz',
-  amprocrighttype => 'timestamptz', amprocnum => '3',
-  amproc => 'brin_minmax_multi_consistent' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamptz',
-  amprocrighttype => 'timestamptz', amprocnum => '4',
-  amproc => 'brin_minmax_multi_union' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamptz',
-  amprocrighttype => 'timestamptz', amprocnum => '5',
-  amproc => 'brin_minmax_multi_options' },
-{ amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'timestamptz',
-  amprocrighttype => 'timestamptz', amprocnum => '11',
-  amproc => 'brin_minmax_multi_distance_timestamp' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamp', amprocrighttype => 'timestamp',
+  amprocnum => '1', amproc => 'brin_minmax_multi_opcinfo' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamp', amprocrighttype => 'timestamp',
+  amprocnum => '2', amproc => 'brin_minmax_multi_add_value' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamp', amprocrighttype => 'timestamp',
+  amprocnum => '3', amproc => 'brin_minmax_multi_consistent' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamp', amprocrighttype => 'timestamp',
+  amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamp', amprocrighttype => 'timestamp',
+  amprocnum => '5', amproc => 'brin_minmax_multi_options' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamp', amprocrighttype => 'timestamp',
+  amprocnum => '11', amproc => 'brin_minmax_multi_distance_timestamp' },
+
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamptz', amprocrighttype => 'timestamptz',
+  amprocnum => '1', amproc => 'brin_minmax_multi_opcinfo' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamptz', amprocrighttype => 'timestamptz',
+  amprocnum => '2', amproc => 'brin_minmax_multi_add_value' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamptz', amprocrighttype => 'timestamptz',
+  amprocnum => '3', amproc => 'brin_minmax_multi_consistent' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamptz', amprocrighttype => 'timestamptz',
+  amprocnum => '4', amproc => 'brin_minmax_multi_union' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamptz', amprocrighttype => 'timestamptz',
+  amprocnum => '5', amproc => 'brin_minmax_multi_options' },
+{ amprocfamily => 'brin/datetime_minmax_multi_ops',
+  amproclefttype => 'timestamptz', amprocrighttype => 'timestamptz',
+  amprocnum => '11', amproc => 'brin_minmax_multi_distance_timestamp' },
 
 { amprocfamily => 'brin/datetime_minmax_multi_ops', amproclefttype => 'date',
   amprocrighttype => 'date', amprocnum => '1',
@@ -1654,8 +1641,7 @@
   amproc => 'timestamp_hash' },
 
 { amprocfamily => 'brin/datetime_bloom_ops', amproclefttype => 'date',
-  amprocrighttype => 'date', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'date', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/datetime_bloom_ops', amproclefttype => 'date',
   amprocrighttype => 'date', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -1665,8 +1651,7 @@
 { amprocfamily => 'brin/datetime_bloom_ops', amproclefttype => 'date',
   amprocrighttype => 'date', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/datetime_bloom_ops', amproclefttype => 'date',
-  amprocrighttype => 'date', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'date', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/datetime_bloom_ops', amproclefttype => 'date',
   amprocrighttype => 'date', amprocnum => '11', amproc => 'hashint4' },
 
@@ -1685,24 +1670,24 @@
   amproc => 'brin_minmax_union' },
 
 # minmax multi interval
-{ amprocfamily => 'brin/interval_minmax_multi_ops', amproclefttype => 'interval',
-  amprocrighttype => 'interval', amprocnum => '1',
+{ amprocfamily => 'brin/interval_minmax_multi_ops',
+  amproclefttype => 'interval', amprocrighttype => 'interval', amprocnum => '1',
   amproc => 'brin_minmax_multi_opcinfo' },
-{ amprocfamily => 'brin/interval_minmax_multi_ops', amproclefttype => 'interval',
-  amprocrighttype => 'interval', amprocnum => '2',
+{ amprocfamily => 'brin/interval_minmax_multi_ops',
+  amproclefttype => 'interval', amprocrighttype => 'interval', amprocnum => '2',
   amproc => 'brin_minmax_multi_add_value' },
-{ amprocfamily => 'brin/interval_minmax_multi_ops', amproclefttype => 'interval',
-  amprocrighttype => 'interval', amprocnum => '3',
+{ amprocfamily => 'brin/interval_minmax_multi_ops',
+  amproclefttype => 'interval', amprocrighttype => 'interval', amprocnum => '3',
   amproc => 'brin_minmax_multi_consistent' },
-{ amprocfamily => 'brin/interval_minmax_multi_ops', amproclefttype => 'interval',
-  amprocrighttype => 'interval', amprocnum => '4',
+{ amprocfamily => 'brin/interval_minmax_multi_ops',
+  amproclefttype => 'interval', amprocrighttype => 'interval', amprocnum => '4',
   amproc => 'brin_minmax_multi_union' },
-{ amprocfamily => 'brin/interval_minmax_multi_ops', amproclefttype => 'interval',
-  amprocrighttype => 'interval', amprocnum => '5',
+{ amprocfamily => 'brin/interval_minmax_multi_ops',
+  amproclefttype => 'interval', amprocrighttype => 'interval', amprocnum => '5',
   amproc => 'brin_minmax_multi_options' },
-{ amprocfamily => 'brin/interval_minmax_multi_ops', amproclefttype => 'interval',
-  amprocrighttype => 'interval', amprocnum => '11',
-  amproc => 'brin_minmax_multi_distance_interval' },
+{ amprocfamily => 'brin/interval_minmax_multi_ops',
+  amproclefttype => 'interval', amprocrighttype => 'interval',
+  amprocnum => '11', amproc => 'brin_minmax_multi_distance_interval' },
 
 # bloom interval
 { amprocfamily => 'brin/interval_bloom_ops', amproclefttype => 'interval',
@@ -1721,8 +1706,7 @@
   amprocrighttype => 'interval', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/interval_bloom_ops', amproclefttype => 'interval',
-  amprocrighttype => 'interval', amprocnum => '11',
-  amproc => 'interval_hash' },
+  amprocrighttype => 'interval', amprocnum => '11', amproc => 'interval_hash' },
 
 # minmax time with time zone
 { amprocfamily => 'brin/timetz_minmax_ops', amproclefttype => 'timetz',
@@ -1769,14 +1753,12 @@
   amprocrighttype => 'timetz', amprocnum => '3',
   amproc => 'brin_bloom_consistent' },
 { amprocfamily => 'brin/timetz_bloom_ops', amproclefttype => 'timetz',
-  amprocrighttype => 'timetz', amprocnum => '4',
-  amproc => 'brin_bloom_union' },
+  amprocrighttype => 'timetz', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/timetz_bloom_ops', amproclefttype => 'timetz',
   amprocrighttype => 'timetz', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/timetz_bloom_ops', amproclefttype => 'timetz',
-  amprocrighttype => 'timetz', amprocnum => '11',
-  amproc => 'timetz_hash' },
+  amprocrighttype => 'timetz', amprocnum => '11', amproc => 'timetz_hash' },
 
 # minmax bit
 { amprocfamily => 'brin/bit_minmax_ops', amproclefttype => 'bit',
@@ -1855,8 +1837,7 @@
   amprocrighttype => 'numeric', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/numeric_bloom_ops', amproclefttype => 'numeric',
-  amprocrighttype => 'numeric', amprocnum => '11',
-  amproc => 'hash_numeric' },
+  amprocrighttype => 'numeric', amprocnum => '11', amproc => 'hash_numeric' },
 
 # minmax uuid
 { amprocfamily => 'brin/uuid_minmax_ops', amproclefttype => 'uuid',
@@ -1893,8 +1874,7 @@
 
 # bloom uuid
 { amprocfamily => 'brin/uuid_bloom_ops', amproclefttype => 'uuid',
-  amprocrighttype => 'uuid', amprocnum => '1',
-  amproc => 'brin_bloom_opcinfo' },
+  amprocrighttype => 'uuid', amprocnum => '1', amproc => 'brin_bloom_opcinfo' },
 { amprocfamily => 'brin/uuid_bloom_ops', amproclefttype => 'uuid',
   amprocrighttype => 'uuid', amprocnum => '2',
   amproc => 'brin_bloom_add_value' },
@@ -1904,8 +1884,7 @@
 { amprocfamily => 'brin/uuid_bloom_ops', amproclefttype => 'uuid',
   amprocrighttype => 'uuid', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/uuid_bloom_ops', amproclefttype => 'uuid',
-  amprocrighttype => 'uuid', amprocnum => '5',
-  amproc => 'brin_bloom_options' },
+  amprocrighttype => 'uuid', amprocnum => '5', amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/uuid_bloom_ops', amproclefttype => 'uuid',
   amprocrighttype => 'uuid', amprocnum => '11', amproc => 'uuid_hash' },
 
@@ -1977,14 +1956,12 @@
   amprocrighttype => 'pg_lsn', amprocnum => '3',
   amproc => 'brin_bloom_consistent' },
 { amprocfamily => 'brin/pg_lsn_bloom_ops', amproclefttype => 'pg_lsn',
-  amprocrighttype => 'pg_lsn', amprocnum => '4',
-  amproc => 'brin_bloom_union' },
+  amprocrighttype => 'pg_lsn', amprocnum => '4', amproc => 'brin_bloom_union' },
 { amprocfamily => 'brin/pg_lsn_bloom_ops', amproclefttype => 'pg_lsn',
   amprocrighttype => 'pg_lsn', amprocnum => '5',
   amproc => 'brin_bloom_options' },
 { amprocfamily => 'brin/pg_lsn_bloom_ops', amproclefttype => 'pg_lsn',
-  amprocrighttype => 'pg_lsn', amprocnum => '11',
-  amproc => 'pg_lsn_hash' },
+  amprocrighttype => 'pg_lsn', amprocnum => '11', amproc => 'pg_lsn_hash' },
 
 # inclusion box
 { amprocfamily => 'brin/box_inclusion_ops', amproclefttype => 'box',
diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h
index 52bfd2cb7b..6400702b3d 100644
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -42,9 +42,9 @@ CATALOG(pg_collation,3456,CollationRelationId)
 	NameData	collcollate;	/* LC_COLLATE setting */
 	NameData	collctype;		/* LC_CTYPE setting */
 #ifdef CATALOG_VARLEN			/* variable-length fields start here */
-	text		collversion BKI_DEFAULT(_null_);	/* provider-dependent */
-													/* version of */
-													/* collation data */
+	text		collversion BKI_DEFAULT(_null_);	/* provider-dependent
+													 * version of collation
+													 * data */
 #endif
 } FormData_pg_collation;
 
diff --git a/src/include/catalog/pg_opclass.dat b/src/include/catalog/pg_opclass.dat
index da25befefe..484727a2fc 100644
--- a/src/include/catalog/pg_opclass.dat
+++ b/src/include/catalog/pg_opclass.dat
@@ -267,114 +267,114 @@
   opcfamily => 'brin/bytea_minmax_ops', opcintype => 'bytea',
   opckeytype => 'bytea' },
 { opcmethod => 'brin', opcname => 'bytea_bloom_ops',
-  opcfamily => 'brin/bytea_bloom_ops', opcintype => 'bytea',
-  opckeytype => 'bytea', opcdefault => 'f' },
+  opcfamily => 'brin/bytea_bloom_ops', opcintype => 'bytea', opcdefault => 'f',
+  opckeytype => 'bytea' },
 { opcmethod => 'brin', opcname => 'char_minmax_ops',
   opcfamily => 'brin/char_minmax_ops', opcintype => 'char',
   opckeytype => 'char' },
 { opcmethod => 'brin', opcname => 'char_bloom_ops',
-  opcfamily => 'brin/char_bloom_ops', opcintype => 'char',
-  opckeytype => 'char', opcdefault => 'f' },
+  opcfamily => 'brin/char_bloom_ops', opcintype => 'char', opcdefault => 'f',
+  opckeytype => 'char' },
 { opcmethod => 'brin', opcname => 'name_minmax_ops',
   opcfamily => 'brin/name_minmax_ops', opcintype => 'name',
   opckeytype => 'name' },
 { opcmethod => 'brin', opcname => 'name_bloom_ops',
-  opcfamily => 'brin/name_bloom_ops', opcintype => 'name',
-  opckeytype => 'name', opcdefault => 'f' },
+  opcfamily => 'brin/name_bloom_ops', opcintype => 'name', opcdefault => 'f',
+  opckeytype => 'name' },
 { opcmethod => 'brin', opcname => 'int8_minmax_ops',
   opcfamily => 'brin/integer_minmax_ops', opcintype => 'int8',
   opckeytype => 'int8' },
 { opcmethod => 'brin', opcname => 'int8_minmax_multi_ops',
   opcfamily => 'brin/integer_minmax_multi_ops', opcintype => 'int8',
-  opckeytype => 'int8', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'int8' },
 { opcmethod => 'brin', opcname => 'int8_bloom_ops',
-  opcfamily => 'brin/integer_bloom_ops', opcintype => 'int8',
-  opckeytype => 'int8', opcdefault => 'f' },
+  opcfamily => 'brin/integer_bloom_ops', opcintype => 'int8', opcdefault => 'f',
+  opckeytype => 'int8' },
 { opcmethod => 'brin', opcname => 'int2_minmax_ops',
   opcfamily => 'brin/integer_minmax_ops', opcintype => 'int2',
   opckeytype => 'int2' },
 { opcmethod => 'brin', opcname => 'int2_minmax_multi_ops',
   opcfamily => 'brin/integer_minmax_multi_ops', opcintype => 'int2',
-  opckeytype => 'int2', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'int2' },
 { opcmethod => 'brin', opcname => 'int2_bloom_ops',
-  opcfamily => 'brin/integer_bloom_ops', opcintype => 'int2',
-  opckeytype => 'int2', opcdefault => 'f' },
+  opcfamily => 'brin/integer_bloom_ops', opcintype => 'int2', opcdefault => 'f',
+  opckeytype => 'int2' },
 { opcmethod => 'brin', opcname => 'int4_minmax_ops',
   opcfamily => 'brin/integer_minmax_ops', opcintype => 'int4',
   opckeytype => 'int4' },
 { opcmethod => 'brin', opcname => 'int4_minmax_multi_ops',
   opcfamily => 'brin/integer_minmax_multi_ops', opcintype => 'int4',
-  opckeytype => 'int4', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'int4' },
 { opcmethod => 'brin', opcname => 'int4_bloom_ops',
-  opcfamily => 'brin/integer_bloom_ops', opcintype => 'int4',
-  opckeytype => 'int4', opcdefault => 'f' },
+  opcfamily => 'brin/integer_bloom_ops', opcintype => 'int4', opcdefault => 'f',
+  opckeytype => 'int4' },
 { opcmethod => 'brin', opcname => 'text_minmax_ops',
   opcfamily => 'brin/text_minmax_ops', opcintype => 'text',
   opckeytype => 'text' },
 { opcmethod => 'brin', opcname => 'text_bloom_ops',
-  opcfamily => 'brin/text_bloom_ops', opcintype => 'text',
-  opckeytype => 'text', opcdefault => 'f' },
+  opcfamily => 'brin/text_bloom_ops', opcintype => 'text', opcdefault => 'f',
+  opckeytype => 'text' },
 { opcmethod => 'brin', opcname => 'oid_minmax_ops',
   opcfamily => 'brin/oid_minmax_ops', opcintype => 'oid', opckeytype => 'oid' },
 { opcmethod => 'brin', opcname => 'oid_minmax_multi_ops',
   opcfamily => 'brin/oid_minmax_multi_ops', opcintype => 'oid',
-  opckeytype => 'oid', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'oid' },
 { opcmethod => 'brin', opcname => 'oid_bloom_ops',
-  opcfamily => 'brin/oid_bloom_ops', opcintype => 'oid',
-  opckeytype => 'oid', opcdefault => 'f' },
+  opcfamily => 'brin/oid_bloom_ops', opcintype => 'oid', opcdefault => 'f',
+  opckeytype => 'oid' },
 { opcmethod => 'brin', opcname => 'tid_minmax_ops',
   opcfamily => 'brin/tid_minmax_ops', opcintype => 'tid', opckeytype => 'tid' },
 { opcmethod => 'brin', opcname => 'tid_bloom_ops',
-  opcfamily => 'brin/tid_bloom_ops', opcintype => 'tid', opckeytype => 'tid',
-  opcdefault => 'f'},
+  opcfamily => 'brin/tid_bloom_ops', opcintype => 'tid', opcdefault => 'f',
+  opckeytype => 'tid' },
 { opcmethod => 'brin', opcname => 'tid_minmax_multi_ops',
   opcfamily => 'brin/tid_minmax_multi_ops', opcintype => 'tid',
-  opckeytype => 'tid', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'tid' },
 { opcmethod => 'brin', opcname => 'float4_minmax_ops',
   opcfamily => 'brin/float_minmax_ops', opcintype => 'float4',
   opckeytype => 'float4' },
 { opcmethod => 'brin', opcname => 'float4_minmax_multi_ops',
   opcfamily => 'brin/float_minmax_multi_ops', opcintype => 'float4',
-  opckeytype => 'float4', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'float4' },
 { opcmethod => 'brin', opcname => 'float4_bloom_ops',
-  opcfamily => 'brin/float_bloom_ops', opcintype => 'float4',
-  opckeytype => 'float4', opcdefault => 'f' },
+  opcfamily => 'brin/float_bloom_ops', opcintype => 'float4', opcdefault => 'f',
+  opckeytype => 'float4' },
 { opcmethod => 'brin', opcname => 'float8_minmax_ops',
   opcfamily => 'brin/float_minmax_ops', opcintype => 'float8',
   opckeytype => 'float8' },
 { opcmethod => 'brin', opcname => 'float8_minmax_multi_ops',
   opcfamily => 'brin/float_minmax_multi_ops', opcintype => 'float8',
-  opckeytype => 'float8', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'float8' },
 { opcmethod => 'brin', opcname => 'float8_bloom_ops',
-  opcfamily => 'brin/float_bloom_ops', opcintype => 'float8',
-  opckeytype => 'float8', opcdefault => 'f' },
+  opcfamily => 'brin/float_bloom_ops', opcintype => 'float8', opcdefault => 'f',
+  opckeytype => 'float8' },
 { opcmethod => 'brin', opcname => 'macaddr_minmax_ops',
   opcfamily => 'brin/macaddr_minmax_ops', opcintype => 'macaddr',
   opckeytype => 'macaddr' },
 { opcmethod => 'brin', opcname => 'macaddr_minmax_multi_ops',
   opcfamily => 'brin/macaddr_minmax_multi_ops', opcintype => 'macaddr',
-  opckeytype => 'macaddr', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'macaddr' },
 { opcmethod => 'brin', opcname => 'macaddr_bloom_ops',
   opcfamily => 'brin/macaddr_bloom_ops', opcintype => 'macaddr',
-  opckeytype => 'macaddr', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'macaddr' },
 { opcmethod => 'brin', opcname => 'macaddr8_minmax_ops',
   opcfamily => 'brin/macaddr8_minmax_ops', opcintype => 'macaddr8',
   opckeytype => 'macaddr8' },
 { opcmethod => 'brin', opcname => 'macaddr8_minmax_multi_ops',
   opcfamily => 'brin/macaddr8_minmax_multi_ops', opcintype => 'macaddr8',
-  opckeytype => 'macaddr8', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'macaddr8' },
 { opcmethod => 'brin', opcname => 'macaddr8_bloom_ops',
   opcfamily => 'brin/macaddr8_bloom_ops', opcintype => 'macaddr8',
-  opckeytype => 'macaddr8', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'macaddr8' },
 { opcmethod => 'brin', opcname => 'inet_minmax_ops',
   opcfamily => 'brin/network_minmax_ops', opcintype => 'inet',
   opcdefault => 'f', opckeytype => 'inet' },
 { opcmethod => 'brin', opcname => 'inet_minmax_multi_ops',
   opcfamily => 'brin/network_minmax_multi_ops', opcintype => 'inet',
-  opcdefault => 'f', opckeytype => 'inet', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'inet' },
 { opcmethod => 'brin', opcname => 'inet_bloom_ops',
-  opcfamily => 'brin/network_bloom_ops', opcintype => 'inet',
-  opcdefault => 'f', opckeytype => 'inet', opcdefault => 'f' },
+  opcfamily => 'brin/network_bloom_ops', opcintype => 'inet', opcdefault => 'f',
+  opckeytype => 'inet' },
 { opcmethod => 'brin', opcname => 'inet_inclusion_ops',
   opcfamily => 'brin/network_inclusion_ops', opcintype => 'inet',
   opckeytype => 'inet' },
@@ -383,61 +383,61 @@
   opckeytype => 'bpchar' },
 { opcmethod => 'brin', opcname => 'bpchar_bloom_ops',
   opcfamily => 'brin/bpchar_bloom_ops', opcintype => 'bpchar',
-  opckeytype => 'bpchar', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'bpchar' },
 { opcmethod => 'brin', opcname => 'time_minmax_ops',
   opcfamily => 'brin/time_minmax_ops', opcintype => 'time',
   opckeytype => 'time' },
 { opcmethod => 'brin', opcname => 'time_minmax_multi_ops',
   opcfamily => 'brin/time_minmax_multi_ops', opcintype => 'time',
-  opckeytype => 'time', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'time' },
 { opcmethod => 'brin', opcname => 'time_bloom_ops',
-  opcfamily => 'brin/time_bloom_ops', opcintype => 'time',
-  opckeytype => 'time', opcdefault => 'f' },
+  opcfamily => 'brin/time_bloom_ops', opcintype => 'time', opcdefault => 'f',
+  opckeytype => 'time' },
 { opcmethod => 'brin', opcname => 'date_minmax_ops',
   opcfamily => 'brin/datetime_minmax_ops', opcintype => 'date',
   opckeytype => 'date' },
 { opcmethod => 'brin', opcname => 'date_minmax_multi_ops',
   opcfamily => 'brin/datetime_minmax_multi_ops', opcintype => 'date',
-  opckeytype => 'date', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'date' },
 { opcmethod => 'brin', opcname => 'date_bloom_ops',
   opcfamily => 'brin/datetime_bloom_ops', opcintype => 'date',
-  opckeytype => 'date', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'date' },
 { opcmethod => 'brin', opcname => 'timestamp_minmax_ops',
   opcfamily => 'brin/datetime_minmax_ops', opcintype => 'timestamp',
   opckeytype => 'timestamp' },
 { opcmethod => 'brin', opcname => 'timestamp_minmax_multi_ops',
   opcfamily => 'brin/datetime_minmax_multi_ops', opcintype => 'timestamp',
-  opckeytype => 'timestamp', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'timestamp' },
 { opcmethod => 'brin', opcname => 'timestamp_bloom_ops',
   opcfamily => 'brin/datetime_bloom_ops', opcintype => 'timestamp',
-  opckeytype => 'timestamp', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'timestamp' },
 { opcmethod => 'brin', opcname => 'timestamptz_minmax_ops',
   opcfamily => 'brin/datetime_minmax_ops', opcintype => 'timestamptz',
   opckeytype => 'timestamptz' },
 { opcmethod => 'brin', opcname => 'timestamptz_minmax_multi_ops',
   opcfamily => 'brin/datetime_minmax_multi_ops', opcintype => 'timestamptz',
-  opckeytype => 'timestamptz', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'timestamptz' },
 { opcmethod => 'brin', opcname => 'timestamptz_bloom_ops',
   opcfamily => 'brin/datetime_bloom_ops', opcintype => 'timestamptz',
-  opckeytype => 'timestamptz', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'timestamptz' },
 { opcmethod => 'brin', opcname => 'interval_minmax_ops',
   opcfamily => 'brin/interval_minmax_ops', opcintype => 'interval',
   opckeytype => 'interval' },
 { opcmethod => 'brin', opcname => 'interval_minmax_multi_ops',
   opcfamily => 'brin/interval_minmax_multi_ops', opcintype => 'interval',
-  opckeytype => 'interval', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'interval' },
 { opcmethod => 'brin', opcname => 'interval_bloom_ops',
   opcfamily => 'brin/interval_bloom_ops', opcintype => 'interval',
-  opckeytype => 'interval', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'interval' },
 { opcmethod => 'brin', opcname => 'timetz_minmax_ops',
   opcfamily => 'brin/timetz_minmax_ops', opcintype => 'timetz',
   opckeytype => 'timetz' },
 { opcmethod => 'brin', opcname => 'timetz_minmax_multi_ops',
   opcfamily => 'brin/timetz_minmax_multi_ops', opcintype => 'timetz',
-  opckeytype => 'timetz', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'timetz' },
 { opcmethod => 'brin', opcname => 'timetz_bloom_ops',
   opcfamily => 'brin/timetz_bloom_ops', opcintype => 'timetz',
-  opckeytype => 'timetz', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'timetz' },
 { opcmethod => 'brin', opcname => 'bit_minmax_ops',
   opcfamily => 'brin/bit_minmax_ops', opcintype => 'bit', opckeytype => 'bit' },
 { opcmethod => 'brin', opcname => 'varbit_minmax_ops',
@@ -448,10 +448,10 @@
   opckeytype => 'numeric' },
 { opcmethod => 'brin', opcname => 'numeric_minmax_multi_ops',
   opcfamily => 'brin/numeric_minmax_multi_ops', opcintype => 'numeric',
-  opckeytype => 'numeric', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'numeric' },
 { opcmethod => 'brin', opcname => 'numeric_bloom_ops',
   opcfamily => 'brin/numeric_bloom_ops', opcintype => 'numeric',
-  opckeytype => 'numeric', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'numeric' },
 
 # no brin opclass for record, anyarray
 
@@ -460,10 +460,10 @@
   opckeytype => 'uuid' },
 { opcmethod => 'brin', opcname => 'uuid_minmax_multi_ops',
   opcfamily => 'brin/uuid_minmax_multi_ops', opcintype => 'uuid',
-  opckeytype => 'uuid', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'uuid' },
 { opcmethod => 'brin', opcname => 'uuid_bloom_ops',
-  opcfamily => 'brin/uuid_bloom_ops', opcintype => 'uuid',
-  opckeytype => 'uuid', opcdefault => 'f' },
+  opcfamily => 'brin/uuid_bloom_ops', opcintype => 'uuid', opcdefault => 'f',
+  opckeytype => 'uuid' },
 { opcmethod => 'brin', opcname => 'range_inclusion_ops',
   opcfamily => 'brin/range_inclusion_ops', opcintype => 'anyrange',
   opckeytype => 'anyrange' },
@@ -472,10 +472,10 @@
   opckeytype => 'pg_lsn' },
 { opcmethod => 'brin', opcname => 'pg_lsn_minmax_multi_ops',
   opcfamily => 'brin/pg_lsn_minmax_multi_ops', opcintype => 'pg_lsn',
-  opckeytype => 'pg_lsn', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'pg_lsn' },
 { opcmethod => 'brin', opcname => 'pg_lsn_bloom_ops',
   opcfamily => 'brin/pg_lsn_bloom_ops', opcintype => 'pg_lsn',
-  opckeytype => 'pg_lsn', opcdefault => 'f' },
+  opcdefault => 'f', opckeytype => 'pg_lsn' },
 
 # no brin opclass for enum, tsvector, tsquery, jsonb
 
diff --git a/src/include/catalog/pg_operator.dat b/src/include/catalog/pg_operator.dat
index 85395a81ee..ec1615cccc 100644
--- a/src/include/catalog/pg_operator.dat
+++ b/src/include/catalog/pg_operator.dat
@@ -241,11 +241,13 @@
   oprname => '>', oprleft => 'tid', oprright => 'tid', oprresult => 'bool',
   oprcom => '<(tid,tid)', oprnegate => '<=(tid,tid)', oprcode => 'tidgt',
   oprrest => 'scalargtsel', oprjoin => 'scalargtjoinsel' },
-{ oid => '2801', oid_symbol => 'TIDLessEqOperator', descr => 'less than or equal',
+{ oid => '2801', oid_symbol => 'TIDLessEqOperator',
+  descr => 'less than or equal',
   oprname => '<=', oprleft => 'tid', oprright => 'tid', oprresult => 'bool',
   oprcom => '>=(tid,tid)', oprnegate => '>(tid,tid)', oprcode => 'tidle',
   oprrest => 'scalarlesel', oprjoin => 'scalarlejoinsel' },
-{ oid => '2802', oid_symbol => 'TIDGreaterEqOperator', descr => 'greater than or equal',
+{ oid => '2802', oid_symbol => 'TIDGreaterEqOperator',
+  descr => 'greater than or equal',
   oprname => '>=', oprleft => 'tid', oprright => 'tid', oprresult => 'bool',
   oprcom => '<=(tid,tid)', oprnegate => '<(tid,tid)', oprcode => 'tidge',
   oprrest => 'scalargesel', oprjoin => 'scalargejoinsel' },
diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 26c3fc0f6b..c3c38c748f 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -1448,7 +1448,7 @@
   proargtypes => 'bytea bytea int4', prosrc => 'byteaoverlay_no_len' },
 { oid => '8436', descr => 'number of set bits',
   proname => 'bit_count', prorettype => 'int8', proargtypes => 'bytea',
-  prosrc => 'bytea_bit_count'},
+  prosrc => 'bytea_bit_count' },
 
 { oid => '725',
   proname => 'dist_pl', prorettype => 'float8', proargtypes => 'point line',
@@ -3731,7 +3731,8 @@
 { oid => '8103', descr => 'list of catalog foreign key relationships',
   proname => 'pg_get_catalog_foreign_keys', procost => '10', prorows => '250',
   proretset => 't', provolatile => 's', prorettype => 'record',
-  proargtypes => '', proallargtypes => '{regclass,_text,regclass,_text,bool,bool}',
+  proargtypes => '',
+  proallargtypes => '{regclass,_text,regclass,_text,bool,bool}',
   proargmodes => '{o,o,o,o,o,o}',
   proargnames => '{fktable,fkcols,pktable,pkcols,is_array,is_opt}',
   prosrc => 'pg_get_catalog_foreign_keys' },
@@ -3905,7 +3906,7 @@
   prosrc => 'bitsetbit' },
 { oid => '8435', descr => 'number of set bits',
   proname => 'bit_count', prorettype => 'int8', proargtypes => 'bit',
-  prosrc => 'bit_bit_count'},
+  prosrc => 'bit_bit_count' },
 
 # for macaddr type support
 { oid => '436', descr => 'I/O',
@@ -5309,8 +5310,8 @@
   proargnames => '{pid,status,receive_start_lsn,receive_start_tli,written_lsn,flushed_lsn,received_tli,last_msg_send_time,last_msg_receipt_time,latest_end_lsn,latest_end_time,slot_name,sender_host,sender_port,conninfo}',
   prosrc => 'pg_stat_get_wal_receiver' },
 { oid => '8595', descr => 'statistics: information about replication slot',
-  proname => 'pg_stat_get_replication_slot', prorows => '1',
-  proisstrict => 'f', proretset => 't', provolatile => 's', proparallel => 'r',
+  proname => 'pg_stat_get_replication_slot', prorows => '1', proisstrict => 'f',
+  proretset => 't', provolatile => 's', proparallel => 'r',
   prorettype => 'record', proargtypes => 'text',
   proallargtypes => '{text,text,int8,int8,int8,int8,int8,int8,int8,int8,timestamptz}',
   proargmodes => '{i,o,o,o,o,o,o,o,o,o,o}',
@@ -5838,15 +5839,14 @@
   proname => 'date_trunc', prorettype => 'timestamp',
   proargtypes => 'text timestamp', prosrc => 'timestamp_trunc' },
 
-{ oid => '8990',
-  descr => 'bin timestamp into specified interval',
+{ oid => '8990', descr => 'bin timestamp into specified interval',
   proname => 'date_bin', prorettype => 'timestamp',
-  proargtypes => 'interval timestamp timestamp',
-  prosrc => 'timestamp_bin' },
+  proargtypes => 'interval timestamp timestamp', prosrc => 'timestamp_bin' },
 { oid => '8993',
   descr => 'bin timestamp with time zone into specified interval',
   proname => 'date_bin', prorettype => 'timestamptz',
-  proargtypes => 'interval timestamptz timestamptz', prosrc => 'timestamptz_bin' },
+  proargtypes => 'interval timestamptz timestamptz',
+  prosrc => 'timestamptz_bin' },
 
 { oid => '2021', descr => 'extract field from timestamp',
   proname => 'date_part', prorettype => 'float8',
@@ -6186,14 +6186,15 @@
 { oid => '2171', descr => 'cancel a server process\' current query',
   proname => 'pg_cancel_backend', provolatile => 'v', prorettype => 'bool',
   proargtypes => 'int4', prosrc => 'pg_cancel_backend' },
-{ oid => '2096', descr => 'terminate a backend process and if timeout is specified, wait for its exit or until timeout occurs',
+{ oid => '2096',
+  descr => 'terminate a backend process and if timeout is specified, wait for its exit or until timeout occurs',
   proname => 'pg_terminate_backend', provolatile => 'v', prorettype => 'bool',
   proargtypes => 'int4 int8', proargnames => '{pid,timeout}',
   prosrc => 'pg_terminate_backend' },
 { oid => '2137', descr => 'wait for a backend process exit or timeout occurs',
-  proname => 'pg_wait_for_backend_termination', provolatile => 'v', prorettype => 'bool',
-  proargtypes => 'int4 int8', proargnames => '{pid,timeout}',
-  prosrc => 'pg_wait_for_backend_termination' },
+  proname => 'pg_wait_for_backend_termination', provolatile => 'v',
+  prorettype => 'bool', proargtypes => 'int4 int8',
+  proargnames => '{pid,timeout}', prosrc => 'pg_wait_for_backend_termination' },
 { oid => '2172', descr => 'prepare for taking an online backup',
   proname => 'pg_start_backup', provolatile => 'v', proparallel => 'r',
   prorettype => 'pg_lsn', proargtypes => 'text bool bool',
@@ -7151,8 +7152,7 @@
   descr => 'bytes required to store the value, perhaps with compression',
   proname => 'pg_column_size', provolatile => 's', prorettype => 'int4',
   proargtypes => 'any', prosrc => 'pg_column_size' },
-{ oid => '2121',
-  descr => 'compression method for the compressed datum',
+{ oid => '2121', descr => 'compression method for the compressed datum',
   proname => 'pg_column_compression', provolatile => 's', prorettype => 'text',
   proargtypes => 'any', prosrc => 'pg_column_compression' },
 { oid => '2322',
@@ -7971,9 +7971,9 @@
 
 # logging memory contexts of the specified backend
 { oid => '4543', descr => 'log memory contexts of the specified backend',
-  proname => 'pg_log_backend_memory_contexts',
-  provolatile => 'v', prorettype => 'bool',
-  proargtypes => 'int4', prosrc => 'pg_log_backend_memory_contexts' },
+  proname => 'pg_log_backend_memory_contexts', provolatile => 'v',
+  prorettype => 'bool', proargtypes => 'int4',
+  prosrc => 'pg_log_backend_memory_contexts' },
 
 # non-persistent series generator
 { oid => '1066', descr => 'non-persistent series generator',
@@ -8059,8 +8059,8 @@
   proname => 'bit_or', prokind => 'a', proisstrict => 'f', prorettype => 'int2',
   proargtypes => 'int2', prosrc => 'aggregate_dummy' },
 { oid => '8452', descr => 'bitwise-xor smallint aggregate',
-  proname => 'bit_xor', prokind => 'a', proisstrict => 'f', prorettype => 'int2',
-  proargtypes => 'int2', prosrc => 'aggregate_dummy' },
+  proname => 'bit_xor', prokind => 'a', proisstrict => 'f',
+  prorettype => 'int2', proargtypes => 'int2', prosrc => 'aggregate_dummy' },
 { oid => '2238', descr => 'bitwise-and integer aggregate',
   proname => 'bit_and', prokind => 'a', proisstrict => 'f',
   prorettype => 'int4', proargtypes => 'int4', prosrc => 'aggregate_dummy' },
@@ -8068,8 +8068,8 @@
   proname => 'bit_or', prokind => 'a', proisstrict => 'f', prorettype => 'int4',
   proargtypes => 'int4', prosrc => 'aggregate_dummy' },
 { oid => '8453', descr => 'bitwise-xor integer aggregate',
-  proname => 'bit_xor', prokind => 'a', proisstrict => 'f', prorettype => 'int4',
-  proargtypes => 'int4', prosrc => 'aggregate_dummy' },
+  proname => 'bit_xor', prokind => 'a', proisstrict => 'f',
+  prorettype => 'int4', proargtypes => 'int4', prosrc => 'aggregate_dummy' },
 { oid => '2240', descr => 'bitwise-and bigint aggregate',
   proname => 'bit_and', prokind => 'a', proisstrict => 'f',
   prorettype => 'int8', proargtypes => 'int8', prosrc => 'aggregate_dummy' },
@@ -8077,8 +8077,8 @@
   proname => 'bit_or', prokind => 'a', proisstrict => 'f', prorettype => 'int8',
   proargtypes => 'int8', prosrc => 'aggregate_dummy' },
 { oid => '8454', descr => 'bitwise-xor bigint aggregate',
-  proname => 'bit_xor', prokind => 'a', proisstrict => 'f', prorettype => 'int8',
-  proargtypes => 'int8', prosrc => 'aggregate_dummy' },
+  proname => 'bit_xor', prokind => 'a', proisstrict => 'f',
+  prorettype => 'int8', proargtypes => 'int8', prosrc => 'aggregate_dummy' },
 { oid => '2242', descr => 'bitwise-and bit aggregate',
   proname => 'bit_and', prokind => 'a', proisstrict => 'f', prorettype => 'bit',
   proargtypes => 'bit', prosrc => 'aggregate_dummy' },
@@ -8289,62 +8289,81 @@
   prosrc => 'brin_minmax_multi_consistent' },
 { oid => '4619', descr => 'BRIN multi minmax support',
   proname => 'brin_minmax_multi_union', prorettype => 'bool',
-  proargtypes => 'internal internal internal', prosrc => 'brin_minmax_multi_union' },
+  proargtypes => 'internal internal internal',
+  prosrc => 'brin_minmax_multi_union' },
 { oid => '4620', descr => 'BRIN multi minmax support',
-  proname => 'brin_minmax_multi_options', prorettype => 'void', proisstrict => 'f',
-  proargtypes => 'internal', prosrc => 'brin_minmax_multi_options' },
+  proname => 'brin_minmax_multi_options', proisstrict => 'f',
+  prorettype => 'void', proargtypes => 'internal',
+  prosrc => 'brin_minmax_multi_options' },
 
 { oid => '4621', descr => 'BRIN multi minmax int2 distance',
   proname => 'brin_minmax_multi_distance_int2', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_int2' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_int2' },
 { oid => '4622', descr => 'BRIN multi minmax int4 distance',
   proname => 'brin_minmax_multi_distance_int4', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_int4' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_int4' },
 { oid => '4623', descr => 'BRIN multi minmax int8 distance',
   proname => 'brin_minmax_multi_distance_int8', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_int8' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_int8' },
 { oid => '4624', descr => 'BRIN multi minmax float4 distance',
   proname => 'brin_minmax_multi_distance_float4', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_float4' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_float4' },
 { oid => '4625', descr => 'BRIN multi minmax float8 distance',
   proname => 'brin_minmax_multi_distance_float8', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_float8' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_float8' },
 { oid => '4626', descr => 'BRIN multi minmax numeric distance',
   proname => 'brin_minmax_multi_distance_numeric', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_numeric' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_numeric' },
 { oid => '4627', descr => 'BRIN multi minmax tid distance',
   proname => 'brin_minmax_multi_distance_tid', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_tid' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_tid' },
 { oid => '4628', descr => 'BRIN multi minmax uuid distance',
   proname => 'brin_minmax_multi_distance_uuid', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_uuid' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_uuid' },
 { oid => '4629', descr => 'BRIN multi minmax date distance',
   proname => 'brin_minmax_multi_distance_date', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_date' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_date' },
 { oid => '4630', descr => 'BRIN multi minmax time distance',
   proname => 'brin_minmax_multi_distance_time', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_time' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_time' },
 { oid => '4631', descr => 'BRIN multi minmax interval distance',
   proname => 'brin_minmax_multi_distance_interval', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_interval' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_interval' },
 { oid => '4632', descr => 'BRIN multi minmax timetz distance',
   proname => 'brin_minmax_multi_distance_timetz', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_timetz' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_timetz' },
 { oid => '4633', descr => 'BRIN multi minmax pg_lsn distance',
   proname => 'brin_minmax_multi_distance_pg_lsn', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_pg_lsn' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_pg_lsn' },
 { oid => '4634', descr => 'BRIN multi minmax macaddr distance',
   proname => 'brin_minmax_multi_distance_macaddr', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_macaddr' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_macaddr' },
 { oid => '4635', descr => 'BRIN multi minmax macaddr8 distance',
   proname => 'brin_minmax_multi_distance_macaddr8', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_macaddr8' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_macaddr8' },
 { oid => '4636', descr => 'BRIN multi minmax inet distance',
   proname => 'brin_minmax_multi_distance_inet', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_inet' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_inet' },
 { oid => '4637', descr => 'BRIN multi minmax timestamp distance',
   proname => 'brin_minmax_multi_distance_timestamp', prorettype => 'float8',
-  proargtypes => 'internal internal', prosrc => 'brin_minmax_multi_distance_timestamp' },
+  proargtypes => 'internal internal',
+  prosrc => 'brin_minmax_multi_distance_timestamp' },
 
 # BRIN inclusion
 { oid => '4105', descr => 'BRIN inclusion support',
@@ -8377,10 +8396,9 @@
   prosrc => 'brin_bloom_consistent' },
 { oid => '4594', descr => 'BRIN bloom support',
   proname => 'brin_bloom_union', prorettype => 'bool',
-  proargtypes => 'internal internal internal',
-  prosrc => 'brin_bloom_union' },
+  proargtypes => 'internal internal internal', prosrc => 'brin_bloom_union' },
 { oid => '4595', descr => 'BRIN bloom support',
-  proname => 'brin_bloom_options', prorettype => 'void', proisstrict => 'f',
+  proname => 'brin_bloom_options', proisstrict => 'f', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'brin_bloom_options' },
 
 # userlock replacements
@@ -10437,9 +10455,8 @@
   proargtypes => 'anymultirange int8', prosrc => 'hash_multirange_extended' },
 
 { oid => '4280', descr => 'int4multirange constructor',
-  proname => 'int4multirange',
-  prorettype => 'int4multirange', proargtypes => '',
-  prosrc => 'multirange_constructor0' },
+  proname => 'int4multirange', prorettype => 'int4multirange',
+  proargtypes => '', prosrc => 'multirange_constructor0' },
 { oid => '4281', descr => 'int4multirange constructor',
   proname => 'int4multirange', prorettype => 'int4multirange',
   proargtypes => 'int4range', prosrc => 'multirange_constructor1' },
@@ -10449,8 +10466,8 @@
   proallargtypes => '{_int4range}', proargmodes => '{v}',
   prosrc => 'multirange_constructor2' },
 { oid => '4283', descr => 'nummultirange constructor',
-  proname => 'nummultirange', prorettype => 'nummultirange',
-  proargtypes => '', prosrc => 'multirange_constructor0' },
+  proname => 'nummultirange', prorettype => 'nummultirange', proargtypes => '',
+  prosrc => 'multirange_constructor0' },
 { oid => '4284', descr => 'nummultirange constructor',
   proname => 'nummultirange', prorettype => 'nummultirange',
   proargtypes => 'numrange', prosrc => 'multirange_constructor1' },
@@ -10460,8 +10477,8 @@
   proallargtypes => '{_numrange}', proargmodes => '{v}',
   prosrc => 'multirange_constructor2' },
 { oid => '4286', descr => 'tsmultirange constructor',
-  proname => 'tsmultirange', prorettype => 'tsmultirange',
-  proargtypes => '', prosrc => 'multirange_constructor0' },
+  proname => 'tsmultirange', prorettype => 'tsmultirange', proargtypes => '',
+  prosrc => 'multirange_constructor0' },
 { oid => '4287', descr => 'tsmultirange constructor',
   proname => 'tsmultirange', prorettype => 'tsmultirange',
   proargtypes => 'tsrange', prosrc => 'multirange_constructor1' },
@@ -10471,9 +10488,8 @@
   proallargtypes => '{_tsrange}', proargmodes => '{v}',
   prosrc => 'multirange_constructor2' },
 { oid => '4289', descr => 'tstzmultirange constructor',
-  proname => 'tstzmultirange',
-  prorettype => 'tstzmultirange', proargtypes => '',
-  prosrc => 'multirange_constructor0' },
+  proname => 'tstzmultirange', prorettype => 'tstzmultirange',
+  proargtypes => '', prosrc => 'multirange_constructor0' },
 { oid => '4290', descr => 'tstzmultirange constructor',
   proname => 'tstzmultirange', prorettype => 'tstzmultirange',
   proargtypes => 'tstzrange', prosrc => 'multirange_constructor1' },
@@ -10483,9 +10499,8 @@
   proallargtypes => '{_tstzrange}', proargmodes => '{v}',
   prosrc => 'multirange_constructor2' },
 { oid => '4292', descr => 'datemultirange constructor',
-  proname => 'datemultirange',
-  prorettype => 'datemultirange', proargtypes => '',
-  prosrc => 'multirange_constructor0' },
+  proname => 'datemultirange', prorettype => 'datemultirange',
+  proargtypes => '', prosrc => 'multirange_constructor0' },
 { oid => '4293', descr => 'datemultirange constructor',
   proname => 'datemultirange', prorettype => 'datemultirange',
   proargtypes => 'daterange', prosrc => 'multirange_constructor1' },
@@ -10495,9 +10510,8 @@
   proallargtypes => '{_daterange}', proargmodes => '{v}',
   prosrc => 'multirange_constructor2' },
 { oid => '4295', descr => 'int8multirange constructor',
-  proname => 'int8multirange',
-  prorettype => 'int8multirange', proargtypes => '',
-  prosrc => 'multirange_constructor0' },
+  proname => 'int8multirange', prorettype => 'int8multirange',
+  proargtypes => '', prosrc => 'multirange_constructor0' },
 { oid => '4296', descr => 'int8multirange constructor',
   proname => 'int8multirange', prorettype => 'int8multirange',
   proargtypes => 'int8range', prosrc => 'multirange_constructor1' },
@@ -10686,7 +10700,8 @@
   prosrc => 'pg_get_replication_slots' },
 { oid => '3786', descr => 'set up a logical replication slot',
   proname => 'pg_create_logical_replication_slot', provolatile => 'v',
-  proparallel => 'u', prorettype => 'record', proargtypes => 'name name bool bool',
+  proparallel => 'u', prorettype => 'record',
+  proargtypes => 'name name bool bool',
   proallargtypes => '{name,name,bool,bool,name,pg_lsn}',
   proargmodes => '{i,i,i,i,o,o}',
   proargnames => '{slot_name,plugin,temporary,twophase,slot_name,lsn}',
@@ -10959,13 +10974,13 @@
 { oid => '4302',
   descr => 'internal conversion function for KOI8R to MULE_INTERNAL',
   proname => 'koi8r_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'koi8r_to_mic',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'koi8r_to_mic', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4303',
   descr => 'internal conversion function for MULE_INTERNAL to KOI8R',
   proname => 'mic_to_koi8r', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_koi8r',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_koi8r', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4304',
   descr => 'internal conversion function for ISO-8859-5 to MULE_INTERNAL',
   proname => 'iso_to_mic', prolang => 'c', prorettype => 'int4',
@@ -10979,23 +10994,23 @@
 { oid => '4306',
   descr => 'internal conversion function for WIN1251 to MULE_INTERNAL',
   proname => 'win1251_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'win1251_to_mic',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'win1251_to_mic', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4307',
   descr => 'internal conversion function for MULE_INTERNAL to WIN1251',
   proname => 'mic_to_win1251', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_win1251',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_win1251', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4308',
   descr => 'internal conversion function for WIN866 to MULE_INTERNAL',
   proname => 'win866_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'win866_to_mic',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'win866_to_mic', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4309',
   descr => 'internal conversion function for MULE_INTERNAL to WIN866',
   proname => 'mic_to_win866', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_win866',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_win866', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4310', descr => 'internal conversion function for KOI8R to WIN1251',
   proname => 'koi8r_to_win1251', prolang => 'c', prorettype => 'int4',
   proargtypes => 'int4 int4 cstring internal int4 bool',
@@ -11006,12 +11021,12 @@
   prosrc => 'win1251_to_koi8r', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4312', descr => 'internal conversion function for KOI8R to WIN866',
   proname => 'koi8r_to_win866', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'koi8r_to_win866',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'koi8r_to_win866', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4313', descr => 'internal conversion function for WIN866 to KOI8R',
   proname => 'win866_to_koi8r', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'win866_to_koi8r',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'win866_to_koi8r', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4314',
   descr => 'internal conversion function for WIN866 to WIN1251',
   proname => 'win866_to_win1251', prolang => 'c', prorettype => 'int4',
@@ -11025,129 +11040,129 @@
 { oid => '4316',
   descr => 'internal conversion function for ISO-8859-5 to KOI8R',
   proname => 'iso_to_koi8r', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'iso_to_koi8r',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'iso_to_koi8r', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4317',
   descr => 'internal conversion function for KOI8R to ISO-8859-5',
   proname => 'koi8r_to_iso', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'koi8r_to_iso',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'koi8r_to_iso', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4318',
   descr => 'internal conversion function for ISO-8859-5 to WIN1251',
   proname => 'iso_to_win1251', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'iso_to_win1251',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'iso_to_win1251', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4319',
   descr => 'internal conversion function for WIN1251 to ISO-8859-5',
   proname => 'win1251_to_iso', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'win1251_to_iso',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'win1251_to_iso', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4320',
   descr => 'internal conversion function for ISO-8859-5 to WIN866',
   proname => 'iso_to_win866', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'iso_to_win866',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'iso_to_win866', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4321',
   descr => 'internal conversion function for WIN866 to ISO-8859-5',
   proname => 'win866_to_iso', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'win866_to_iso',
-  probin => '$libdir/cyrillic_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'win866_to_iso', probin => '$libdir/cyrillic_and_mic' },
 { oid => '4322',
   descr => 'internal conversion function for EUC_CN to MULE_INTERNAL',
   proname => 'euc_cn_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_cn_to_mic',
-  probin => '$libdir/euc_cn_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_cn_to_mic', probin => '$libdir/euc_cn_and_mic' },
 { oid => '4323',
   descr => 'internal conversion function for MULE_INTERNAL to EUC_CN',
   proname => 'mic_to_euc_cn', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_euc_cn',
-  probin => '$libdir/euc_cn_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_euc_cn', probin => '$libdir/euc_cn_and_mic' },
 { oid => '4324', descr => 'internal conversion function for EUC_JP to SJIS',
   proname => 'euc_jp_to_sjis', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_jp_to_sjis',
-  probin => '$libdir/euc_jp_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_jp_to_sjis', probin => '$libdir/euc_jp_and_sjis' },
 { oid => '4325', descr => 'internal conversion function for SJIS to EUC_JP',
   proname => 'sjis_to_euc_jp', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'sjis_to_euc_jp',
-  probin => '$libdir/euc_jp_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'sjis_to_euc_jp', probin => '$libdir/euc_jp_and_sjis' },
 { oid => '4326',
   descr => 'internal conversion function for EUC_JP to MULE_INTERNAL',
   proname => 'euc_jp_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_jp_to_mic',
-  probin => '$libdir/euc_jp_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_jp_to_mic', probin => '$libdir/euc_jp_and_sjis' },
 { oid => '4327',
   descr => 'internal conversion function for SJIS to MULE_INTERNAL',
   proname => 'sjis_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'sjis_to_mic',
-  probin => '$libdir/euc_jp_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'sjis_to_mic', probin => '$libdir/euc_jp_and_sjis' },
 { oid => '4328',
   descr => 'internal conversion function for MULE_INTERNAL to EUC_JP',
   proname => 'mic_to_euc_jp', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_euc_jp',
-  probin => '$libdir/euc_jp_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_euc_jp', probin => '$libdir/euc_jp_and_sjis' },
 { oid => '4329',
   descr => 'internal conversion function for MULE_INTERNAL to SJIS',
   proname => 'mic_to_sjis', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_sjis',
-  probin => '$libdir/euc_jp_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_sjis', probin => '$libdir/euc_jp_and_sjis' },
 { oid => '4330',
   descr => 'internal conversion function for EUC_KR to MULE_INTERNAL',
   proname => 'euc_kr_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_kr_to_mic',
-  probin => '$libdir/euc_kr_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_kr_to_mic', probin => '$libdir/euc_kr_and_mic' },
 { oid => '4331',
   descr => 'internal conversion function for MULE_INTERNAL to EUC_KR',
   proname => 'mic_to_euc_kr', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_euc_kr',
-  probin => '$libdir/euc_kr_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_euc_kr', probin => '$libdir/euc_kr_and_mic' },
 { oid => '4332', descr => 'internal conversion function for EUC_TW to BIG5',
   proname => 'euc_tw_to_big5', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_tw_to_big5',
-  probin => '$libdir/euc_tw_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_tw_to_big5', probin => '$libdir/euc_tw_and_big5' },
 { oid => '4333', descr => 'internal conversion function for BIG5 to EUC_TW',
   proname => 'big5_to_euc_tw', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'big5_to_euc_tw',
-  probin => '$libdir/euc_tw_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'big5_to_euc_tw', probin => '$libdir/euc_tw_and_big5' },
 { oid => '4334',
   descr => 'internal conversion function for EUC_TW to MULE_INTERNAL',
   proname => 'euc_tw_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_tw_to_mic',
-  probin => '$libdir/euc_tw_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_tw_to_mic', probin => '$libdir/euc_tw_and_big5' },
 { oid => '4335',
   descr => 'internal conversion function for BIG5 to MULE_INTERNAL',
   proname => 'big5_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'big5_to_mic',
-  probin => '$libdir/euc_tw_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'big5_to_mic', probin => '$libdir/euc_tw_and_big5' },
 { oid => '4336',
   descr => 'internal conversion function for MULE_INTERNAL to EUC_TW',
   proname => 'mic_to_euc_tw', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_euc_tw',
-  probin => '$libdir/euc_tw_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_euc_tw', probin => '$libdir/euc_tw_and_big5' },
 { oid => '4337',
   descr => 'internal conversion function for MULE_INTERNAL to BIG5',
   proname => 'mic_to_big5', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_big5',
-  probin => '$libdir/euc_tw_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_big5', probin => '$libdir/euc_tw_and_big5' },
 { oid => '4338',
   descr => 'internal conversion function for LATIN2 to MULE_INTERNAL',
   proname => 'latin2_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'latin2_to_mic',
-  probin => '$libdir/latin2_and_win1250' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'latin2_to_mic', probin => '$libdir/latin2_and_win1250' },
 { oid => '4339',
   descr => 'internal conversion function for MULE_INTERNAL to LATIN2',
   proname => 'mic_to_latin2', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_latin2',
-  probin => '$libdir/latin2_and_win1250' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_latin2', probin => '$libdir/latin2_and_win1250' },
 { oid => '4340',
   descr => 'internal conversion function for WIN1250 to MULE_INTERNAL',
   proname => 'win1250_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'win1250_to_mic',
-  probin => '$libdir/latin2_and_win1250' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'win1250_to_mic', probin => '$libdir/latin2_and_win1250' },
 { oid => '4341',
   descr => 'internal conversion function for MULE_INTERNAL to WIN1250',
   proname => 'mic_to_win1250', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_win1250',
-  probin => '$libdir/latin2_and_win1250' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_win1250', probin => '$libdir/latin2_and_win1250' },
 { oid => '4342',
   descr => 'internal conversion function for LATIN2 to WIN1250',
   proname => 'latin2_to_win1250', prolang => 'c', prorettype => 'int4',
@@ -11161,123 +11176,123 @@
 { oid => '4344',
   descr => 'internal conversion function for LATIN1 to MULE_INTERNAL',
   proname => 'latin1_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'latin1_to_mic',
-  probin => '$libdir/latin_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'latin1_to_mic', probin => '$libdir/latin_and_mic' },
 { oid => '4345',
   descr => 'internal conversion function for MULE_INTERNAL to LATIN1',
   proname => 'mic_to_latin1', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_latin1',
-  probin => '$libdir/latin_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_latin1', probin => '$libdir/latin_and_mic' },
 { oid => '4346',
   descr => 'internal conversion function for LATIN3 to MULE_INTERNAL',
   proname => 'latin3_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'latin3_to_mic',
-  probin => '$libdir/latin_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'latin3_to_mic', probin => '$libdir/latin_and_mic' },
 { oid => '4347',
   descr => 'internal conversion function for MULE_INTERNAL to LATIN3',
   proname => 'mic_to_latin3', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_latin3',
-  probin => '$libdir/latin_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_latin3', probin => '$libdir/latin_and_mic' },
 { oid => '4348',
   descr => 'internal conversion function for LATIN4 to MULE_INTERNAL',
   proname => 'latin4_to_mic', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'latin4_to_mic',
-  probin => '$libdir/latin_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'latin4_to_mic', probin => '$libdir/latin_and_mic' },
 { oid => '4349',
   descr => 'internal conversion function for MULE_INTERNAL to LATIN4',
   proname => 'mic_to_latin4', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'mic_to_latin4',
-  probin => '$libdir/latin_and_mic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'mic_to_latin4', probin => '$libdir/latin_and_mic' },
 { oid => '4352', descr => 'internal conversion function for BIG5 to UTF8',
   proname => 'big5_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'big5_to_utf8',
-  probin => '$libdir/utf8_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'big5_to_utf8', probin => '$libdir/utf8_and_big5' },
 { oid => '4353', descr => 'internal conversion function for UTF8 to BIG5',
   proname => 'utf8_to_big5', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_big5',
-  probin => '$libdir/utf8_and_big5' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_big5', probin => '$libdir/utf8_and_big5' },
 { oid => '4354', descr => 'internal conversion function for UTF8 to KOI8R',
   proname => 'utf8_to_koi8r', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_koi8r',
-  probin => '$libdir/utf8_and_cyrillic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_koi8r', probin => '$libdir/utf8_and_cyrillic' },
 { oid => '4355', descr => 'internal conversion function for KOI8R to UTF8',
   proname => 'koi8r_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'koi8r_to_utf8',
-  probin => '$libdir/utf8_and_cyrillic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'koi8r_to_utf8', probin => '$libdir/utf8_and_cyrillic' },
 { oid => '4356', descr => 'internal conversion function for UTF8 to KOI8U',
   proname => 'utf8_to_koi8u', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_koi8u',
-  probin => '$libdir/utf8_and_cyrillic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_koi8u', probin => '$libdir/utf8_and_cyrillic' },
 { oid => '4357', descr => 'internal conversion function for KOI8U to UTF8',
   proname => 'koi8u_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'koi8u_to_utf8',
-  probin => '$libdir/utf8_and_cyrillic' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'koi8u_to_utf8', probin => '$libdir/utf8_and_cyrillic' },
 { oid => '4358', descr => 'internal conversion function for UTF8 to WIN',
   proname => 'utf8_to_win', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_win',
-  probin => '$libdir/utf8_and_win' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_win', probin => '$libdir/utf8_and_win' },
 { oid => '4359', descr => 'internal conversion function for WIN to UTF8',
   proname => 'win_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'win_to_utf8',
-  probin => '$libdir/utf8_and_win' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'win_to_utf8', probin => '$libdir/utf8_and_win' },
 { oid => '4360', descr => 'internal conversion function for EUC_CN to UTF8',
   proname => 'euc_cn_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_cn_to_utf8',
-  probin => '$libdir/utf8_and_euc_cn' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_cn_to_utf8', probin => '$libdir/utf8_and_euc_cn' },
 { oid => '4361', descr => 'internal conversion function for UTF8 to EUC_CN',
   proname => 'utf8_to_euc_cn', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_euc_cn',
-  probin => '$libdir/utf8_and_euc_cn' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_euc_cn', probin => '$libdir/utf8_and_euc_cn' },
 { oid => '4362', descr => 'internal conversion function for EUC_JP to UTF8',
   proname => 'euc_jp_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_jp_to_utf8',
-  probin => '$libdir/utf8_and_euc_jp' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_jp_to_utf8', probin => '$libdir/utf8_and_euc_jp' },
 { oid => '4363', descr => 'internal conversion function for UTF8 to EUC_JP',
   proname => 'utf8_to_euc_jp', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_euc_jp',
-  probin => '$libdir/utf8_and_euc_jp' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_euc_jp', probin => '$libdir/utf8_and_euc_jp' },
 { oid => '4364', descr => 'internal conversion function for EUC_KR to UTF8',
   proname => 'euc_kr_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_kr_to_utf8',
-  probin => '$libdir/utf8_and_euc_kr' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_kr_to_utf8', probin => '$libdir/utf8_and_euc_kr' },
 { oid => '4365', descr => 'internal conversion function for UTF8 to EUC_KR',
   proname => 'utf8_to_euc_kr', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_euc_kr',
-  probin => '$libdir/utf8_and_euc_kr' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_euc_kr', probin => '$libdir/utf8_and_euc_kr' },
 { oid => '4366', descr => 'internal conversion function for EUC_TW to UTF8',
   proname => 'euc_tw_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'euc_tw_to_utf8',
-  probin => '$libdir/utf8_and_euc_tw' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'euc_tw_to_utf8', probin => '$libdir/utf8_and_euc_tw' },
 { oid => '4367', descr => 'internal conversion function for UTF8 to EUC_TW',
   proname => 'utf8_to_euc_tw', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_euc_tw',
-  probin => '$libdir/utf8_and_euc_tw' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_euc_tw', probin => '$libdir/utf8_and_euc_tw' },
 { oid => '4368', descr => 'internal conversion function for GB18030 to UTF8',
   proname => 'gb18030_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'gb18030_to_utf8',
-  probin => '$libdir/utf8_and_gb18030' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'gb18030_to_utf8', probin => '$libdir/utf8_and_gb18030' },
 { oid => '4369', descr => 'internal conversion function for UTF8 to GB18030',
   proname => 'utf8_to_gb18030', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_gb18030',
-  probin => '$libdir/utf8_and_gb18030' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_gb18030', probin => '$libdir/utf8_and_gb18030' },
 { oid => '4370', descr => 'internal conversion function for GBK to UTF8',
   proname => 'gbk_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'gbk_to_utf8',
-  probin => '$libdir/utf8_and_gbk' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'gbk_to_utf8', probin => '$libdir/utf8_and_gbk' },
 { oid => '4371', descr => 'internal conversion function for UTF8 to GBK',
   proname => 'utf8_to_gbk', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_gbk',
-  probin => '$libdir/utf8_and_gbk' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_gbk', probin => '$libdir/utf8_and_gbk' },
 { oid => '4372',
   descr => 'internal conversion function for UTF8 to ISO-8859 2-16',
   proname => 'utf8_to_iso8859', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_iso8859',
-  probin => '$libdir/utf8_and_iso8859' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_iso8859', probin => '$libdir/utf8_and_iso8859' },
 { oid => '4373',
   descr => 'internal conversion function for ISO-8859 2-16 to UTF8',
   proname => 'iso8859_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'iso8859_to_utf8',
-  probin => '$libdir/utf8_and_iso8859' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'iso8859_to_utf8', probin => '$libdir/utf8_and_iso8859' },
 { oid => '4374', descr => 'internal conversion function for LATIN1 to UTF8',
   proname => 'iso8859_1_to_utf8', prolang => 'c', prorettype => 'int4',
   proargtypes => 'int4 int4 cstring internal int4 bool',
@@ -11288,28 +11303,28 @@
   prosrc => 'utf8_to_iso8859_1', probin => '$libdir/utf8_and_iso8859_1' },
 { oid => '4376', descr => 'internal conversion function for JOHAB to UTF8',
   proname => 'johab_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'johab_to_utf8',
-  probin => '$libdir/utf8_and_johab' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'johab_to_utf8', probin => '$libdir/utf8_and_johab' },
 { oid => '4377', descr => 'internal conversion function for UTF8 to JOHAB',
   proname => 'utf8_to_johab', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_johab',
-  probin => '$libdir/utf8_and_johab' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_johab', probin => '$libdir/utf8_and_johab' },
 { oid => '4378', descr => 'internal conversion function for SJIS to UTF8',
   proname => 'sjis_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'sjis_to_utf8',
-  probin => '$libdir/utf8_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'sjis_to_utf8', probin => '$libdir/utf8_and_sjis' },
 { oid => '4379', descr => 'internal conversion function for UTF8 to SJIS',
   proname => 'utf8_to_sjis', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_sjis',
-  probin => '$libdir/utf8_and_sjis' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_sjis', probin => '$libdir/utf8_and_sjis' },
 { oid => '4380', descr => 'internal conversion function for UHC to UTF8',
   proname => 'uhc_to_utf8', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'uhc_to_utf8',
-  probin => '$libdir/utf8_and_uhc' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'uhc_to_utf8', probin => '$libdir/utf8_and_uhc' },
 { oid => '4381', descr => 'internal conversion function for UTF8 to UHC',
   proname => 'utf8_to_uhc', prolang => 'c', prorettype => 'int4',
-  proargtypes => 'int4 int4 cstring internal int4 bool', prosrc => 'utf8_to_uhc',
-  probin => '$libdir/utf8_and_uhc' },
+  proargtypes => 'int4 int4 cstring internal int4 bool',
+  prosrc => 'utf8_to_uhc', probin => '$libdir/utf8_and_uhc' },
 { oid => '4382',
   descr => 'internal conversion function for EUC_JIS_2004 to UTF8',
   proname => 'euc_jis_2004_to_utf8', prolang => 'c', prorettype => 'int4',
@@ -11586,21 +11601,25 @@
   prorettype => 'pg_brin_bloom_summary', proargtypes => 'internal',
   prosrc => 'brin_bloom_summary_recv' },
 { oid => '4599', descr => 'I/O',
-  proname => 'brin_bloom_summary_send', provolatile => 's', prorettype => 'bytea',
-  proargtypes => 'pg_brin_bloom_summary', prosrc => 'brin_bloom_summary_send' },
+  proname => 'brin_bloom_summary_send', provolatile => 's',
+  prorettype => 'bytea', proargtypes => 'pg_brin_bloom_summary',
+  prosrc => 'brin_bloom_summary_send' },
 
 { oid => '4638', descr => 'I/O',
-  proname => 'brin_minmax_multi_summary_in', prorettype => 'pg_brin_minmax_multi_summary',
-  proargtypes => 'cstring', prosrc => 'brin_minmax_multi_summary_in' },
+  proname => 'brin_minmax_multi_summary_in',
+  prorettype => 'pg_brin_minmax_multi_summary', proargtypes => 'cstring',
+  prosrc => 'brin_minmax_multi_summary_in' },
 { oid => '4639', descr => 'I/O',
   proname => 'brin_minmax_multi_summary_out', prorettype => 'cstring',
-  proargtypes => 'pg_brin_minmax_multi_summary', prosrc => 'brin_minmax_multi_summary_out' },
+  proargtypes => 'pg_brin_minmax_multi_summary',
+  prosrc => 'brin_minmax_multi_summary_out' },
 { oid => '4640', descr => 'I/O',
   proname => 'brin_minmax_multi_summary_recv', provolatile => 's',
   prorettype => 'pg_brin_minmax_multi_summary', proargtypes => 'internal',
   prosrc => 'brin_minmax_multi_summary_recv' },
 { oid => '4641', descr => 'I/O',
-  proname => 'brin_minmax_multi_summary_send', provolatile => 's', prorettype => 'bytea',
-  proargtypes => 'pg_brin_minmax_multi_summary', prosrc => 'brin_minmax_multi_summary_send' },
+  proname => 'brin_minmax_multi_summary_send', provolatile => 's',
+  prorettype => 'bytea', proargtypes => 'pg_brin_minmax_multi_summary',
+  prosrc => 'brin_minmax_multi_summary_send' },
 
 ]
diff --git a/src/include/catalog/pg_type.dat b/src/include/catalog/pg_type.dat
index 8c145c00be..09fe7691db 100644
--- a/src/include/catalog/pg_type.dat
+++ b/src/include/catalog/pg_type.dat
@@ -443,9 +443,9 @@
 # jsonb
 { oid => '3802', array_type_oid => '3807', descr => 'Binary JSON',
   typname => 'jsonb', typlen => '-1', typbyval => 'f', typcategory => 'U',
-  typinput => 'jsonb_in', typoutput => 'jsonb_out', typreceive => 'jsonb_recv',
-  typsend => 'jsonb_send', typalign => 'i', typstorage => 'x',
-  typsubscript => 'jsonb_subscript_handler' },
+  typsubscript => 'jsonb_subscript_handler', typinput => 'jsonb_in',
+  typoutput => 'jsonb_out', typreceive => 'jsonb_recv', typsend => 'jsonb_send',
+  typalign => 'i', typstorage => 'x' },
 { oid => '4072', array_type_oid => '4073', descr => 'JSON path',
   typname => 'jsonpath', typlen => '-1', typbyval => 'f', typcategory => 'U',
   typinput => 'jsonpath_in', typoutput => 'jsonpath_out',
@@ -679,16 +679,17 @@
   typtype => 'p', typcategory => 'P', typinput => 'anycompatiblemultirange_in',
   typoutput => 'anycompatiblemultirange_out', typreceive => '-', typsend => '-',
   typalign => 'd', typstorage => 'x' },
-{ oid => '4600',
-  descr => 'BRIN bloom summary',
-  typname => 'pg_brin_bloom_summary', typlen => '-1', typbyval => 'f', typcategory => 'S',
-  typinput => 'brin_bloom_summary_in', typoutput => 'brin_bloom_summary_out',
+{ oid => '4600', descr => 'BRIN bloom summary',
+  typname => 'pg_brin_bloom_summary', typlen => '-1', typbyval => 'f',
+  typcategory => 'S', typinput => 'brin_bloom_summary_in',
+  typoutput => 'brin_bloom_summary_out',
   typreceive => 'brin_bloom_summary_recv', typsend => 'brin_bloom_summary_send',
   typalign => 'i', typstorage => 'x', typcollation => 'default' },
-{ oid => '4601',
-  descr => 'BRIN minmax-multi summary',
-  typname => 'pg_brin_minmax_multi_summary', typlen => '-1', typbyval => 'f', typcategory => 'S',
-  typinput => 'brin_minmax_multi_summary_in', typoutput => 'brin_minmax_multi_summary_out',
-  typreceive => 'brin_minmax_multi_summary_recv', typsend => 'brin_minmax_multi_summary_send',
-  typalign => 'i', typstorage => 'x', typcollation => 'default' },
+{ oid => '4601', descr => 'BRIN minmax-multi summary',
+  typname => 'pg_brin_minmax_multi_summary', typlen => '-1', typbyval => 'f',
+  typcategory => 'S', typinput => 'brin_minmax_multi_summary_in',
+  typoutput => 'brin_minmax_multi_summary_out',
+  typreceive => 'brin_minmax_multi_summary_recv',
+  typsend => 'brin_minmax_multi_summary_send', typalign => 'i',
+  typstorage => 'x', typcollation => 'default' },
 ]
diff --git a/src/include/catalog/renumber_oids.pl b/src/include/catalog/renumber_oids.pl
index 52c32dc961..660f7ddf24 100755
--- a/src/include/catalog/renumber_oids.pl
+++ b/src/include/catalog/renumber_oids.pl
@@ -62,7 +62,7 @@ if ($output_path ne '' && substr($output_path, -1) ne '/')
 
 # Collect all the existing assigned OIDs (including those to be remapped).
 my @header_files = glob("pg_*.h");
-my $oids = Catalog::FindAllOidsFromHeaders(@header_files);
+my $oids         = Catalog::FindAllOidsFromHeaders(@header_files);
 
 # Hash-ify the existing OIDs for convenient lookup.
 my %oidhash;
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index 8c4748e33d..264895d278 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -62,8 +62,8 @@ extern void DoCopy(ParseState *state, const CopyStmt *stmt,
 
 extern void ProcessCopyOptions(ParseState *pstate, CopyFormatOptions *ops_out, bool is_from, List *options);
 extern CopyFromState BeginCopyFrom(ParseState *pstate, Relation rel, Node *whereClause,
-							   const char *filename,
-							   bool is_program, copy_data_source_cb data_source_cb, List *attnamelist, List *options);
+								   const char *filename,
+								   bool is_program, copy_data_source_cb data_source_cb, List *attnamelist, List *options);
 extern void EndCopyFrom(CopyFromState cstate);
 extern bool NextCopyFrom(CopyFromState cstate, ExprContext *econtext,
 						 Datum *values, bool *nulls);
diff --git a/src/include/commands/copyfrom_internal.h b/src/include/commands/copyfrom_internal.h
index 858af7a717..4d68d9cceb 100644
--- a/src/include/commands/copyfrom_internal.h
+++ b/src/include/commands/copyfrom_internal.h
@@ -129,23 +129,23 @@ typedef struct CopyFromStateData
 	/*
 	 * input_buf holds input data, already converted to database encoding.
 	 *
-	 * In text mode, CopyReadLine parses this data sufficiently to locate
-	 * line boundaries, then transfers the data to line_buf. We guarantee
-	 * that there is a \0 at input_buf[input_buf_len] at all times.  (In
-	 * binary mode, input_buf is not used.)
+	 * In text mode, CopyReadLine parses this data sufficiently to locate line
+	 * boundaries, then transfers the data to line_buf. We guarantee that
+	 * there is a \0 at input_buf[input_buf_len] at all times.  (In binary
+	 * mode, input_buf is not used.)
 	 *
 	 * If encoding conversion is not required, input_buf is not a separate
 	 * buffer but points directly to raw_buf.  In that case, input_buf_len
 	 * tracks the number of bytes that have been verified as valid in the
-	 * database encoding, and raw_buf_len is the total number of bytes
-	 * stored in the buffer.
+	 * database encoding, and raw_buf_len is the total number of bytes stored
+	 * in the buffer.
 	 */
 #define INPUT_BUF_SIZE 65536	/* we palloc INPUT_BUF_SIZE+1 bytes */
 	char	   *input_buf;
 	int			input_buf_index;	/* next byte to process */
-	int			input_buf_len;		/* total # of bytes stored */
+	int			input_buf_len;	/* total # of bytes stored */
 	bool		input_reached_eof;	/* true if we reached EOF */
-	bool		input_reached_error; /* true if a conversion error happened */
+	bool		input_reached_error;	/* true if a conversion error happened */
 	/* Shorthand for number of unconsumed bytes available in input_buf */
 #define INPUT_BUF_BYTES(cstate) ((cstate)->input_buf_len - (cstate)->input_buf_index)
 
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 6bce4d76fe..42bf1c7519 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -83,7 +83,7 @@ extern ObjectAddress AlterOperator(AlterOperatorStmt *stmt);
 extern ObjectAddress CreateStatistics(CreateStatsStmt *stmt);
 extern ObjectAddress AlterStatistics(AlterStatsStmt *stmt);
 extern void RemoveStatisticsById(Oid statsOid);
-extern Oid StatisticsGetRelation(Oid statId, bool missing_ok);
+extern Oid	StatisticsGetRelation(Oid statId, bool missing_ok);
 
 /* commands/aggregatecmds.c */
 extern ObjectAddress DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle,
diff --git a/src/include/executor/execAsync.h b/src/include/executor/execAsync.h
index 724034f226..7551b553f8 100644
--- a/src/include/executor/execAsync.h
+++ b/src/include/executor/execAsync.h
@@ -22,4 +22,4 @@ extern void ExecAsyncResponse(AsyncRequest *areq);
 extern void ExecAsyncRequestDone(AsyncRequest *areq, TupleTableSlot *result);
 extern void ExecAsyncRequestPending(AsyncRequest *areq);
 
-#endif   /* EXECASYNC_H */
+#endif							/* EXECASYNC_H */
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index b56ce26da0..a9e14e2fbe 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -30,7 +30,7 @@ typedef struct SQLFunctionParseInfo
 	char	  **argnames;		/* names of input arguments; NULL if none */
 	/* Note that argnames[i] can be NULL, if some args are unnamed */
 	Oid			collation;		/* function's input collation, if known */
-}			SQLFunctionParseInfo;
+} SQLFunctionParseInfo;
 
 typedef SQLFunctionParseInfo *SQLFunctionParseInfoPtr;
 
diff --git a/src/include/foreign/fdwapi.h b/src/include/foreign/fdwapi.h
index 4f17becbb8..a801cd3057 100644
--- a/src/include/foreign/fdwapi.h
+++ b/src/include/foreign/fdwapi.h
@@ -87,10 +87,10 @@ typedef TupleTableSlot *(*ExecForeignInsert_function) (EState *estate,
 													   TupleTableSlot *planSlot);
 
 typedef TupleTableSlot **(*ExecForeignBatchInsert_function) (EState *estate,
-													   ResultRelInfo *rinfo,
-													   TupleTableSlot **slots,
-													   TupleTableSlot **planSlots,
-													   int *numSlots);
+															 ResultRelInfo *rinfo,
+															 TupleTableSlot **slots,
+															 TupleTableSlot **planSlots,
+															 int *numSlots);
 
 typedef int (*GetForeignModifyBatchSize_function) (ResultRelInfo *rinfo);
 
diff --git a/src/include/lib/sort_template.h b/src/include/lib/sort_template.h
index 24d6d0006c..f52627d8ce 100644
--- a/src/include/lib/sort_template.h
+++ b/src/include/lib/sort_template.h
@@ -176,11 +176,11 @@
 
 #ifdef ST_COMPARE_RUNTIME_POINTER
 typedef int (*ST_COMPARATOR_TYPE_NAME) (const ST_ELEMENT_TYPE *,
-										const ST_ELEMENT_TYPE *ST_SORT_PROTO_ARG);
+										const ST_ELEMENT_TYPE * ST_SORT_PROTO_ARG);
 #endif
 
 /* Declare the sort function.  Note optional arguments at end. */
-ST_SCOPE void ST_SORT(ST_ELEMENT_TYPE *first, size_t n
+ST_SCOPE void ST_SORT(ST_ELEMENT_TYPE * first, size_t n
 					  ST_SORT_PROTO_ELEMENT_SIZE
 					  ST_SORT_PROTO_COMPARE
 					  ST_SORT_PROTO_ARG);
@@ -245,9 +245,9 @@ ST_SCOPE void ST_SORT(ST_ELEMENT_TYPE *first, size_t n
  * in the qsort function.
  */
 static pg_noinline ST_ELEMENT_TYPE *
-ST_MED3(ST_ELEMENT_TYPE *a,
-		ST_ELEMENT_TYPE *b,
-		ST_ELEMENT_TYPE *c
+ST_MED3(ST_ELEMENT_TYPE * a,
+		ST_ELEMENT_TYPE * b,
+		ST_ELEMENT_TYPE * c
 		ST_SORT_PROTO_COMPARE
 		ST_SORT_PROTO_ARG)
 {
@@ -257,7 +257,7 @@ ST_MED3(ST_ELEMENT_TYPE *a,
 }
 
 static inline void
-ST_SWAP(ST_POINTER_TYPE *a, ST_POINTER_TYPE *b)
+ST_SWAP(ST_POINTER_TYPE * a, ST_POINTER_TYPE * b)
 {
 	ST_POINTER_TYPE tmp = *a;
 
@@ -266,7 +266,7 @@ ST_SWAP(ST_POINTER_TYPE *a, ST_POINTER_TYPE *b)
 }
 
 static inline void
-ST_SWAPN(ST_POINTER_TYPE *a, ST_POINTER_TYPE *b, size_t n)
+ST_SWAPN(ST_POINTER_TYPE * a, ST_POINTER_TYPE * b, size_t n)
 {
 	for (size_t i = 0; i < n; ++i)
 		ST_SWAP(&a[i], &b[i]);
@@ -276,7 +276,7 @@ ST_SWAPN(ST_POINTER_TYPE *a, ST_POINTER_TYPE *b, size_t n)
  * Sort an array.
  */
 ST_SCOPE void
-ST_SORT(ST_ELEMENT_TYPE *data, size_t n
+ST_SORT(ST_ELEMENT_TYPE * data, size_t n
 		ST_SORT_PROTO_ELEMENT_SIZE
 		ST_SORT_PROTO_COMPARE
 		ST_SORT_PROTO_ARG)
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 91a1c3a780..7795a69490 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -461,9 +461,9 @@ typedef struct ResultRelInfo
 	bool		ri_usesFdwDirectModify;
 
 	/* batch insert stuff */
-	int			ri_NumSlots;		/* number of slots in the array */
-	int			ri_BatchSize;		/* max slots inserted in a single batch */
-	TupleTableSlot **ri_Slots;		/* input tuples for batch insert */
+	int			ri_NumSlots;	/* number of slots in the array */
+	int			ri_BatchSize;	/* max slots inserted in a single batch */
+	TupleTableSlot **ri_Slots;	/* input tuples for batch insert */
 	TupleTableSlot **ri_PlanSlots;
 
 	/* list of WithCheckOption's to be checked */
@@ -1255,16 +1255,16 @@ struct AppendState
 	int			as_whichplan;
 	bool		as_begun;		/* false means need to initialize */
 	Bitmapset  *as_asyncplans;	/* asynchronous plans indexes */
-	int			as_nasyncplans;	/* # of asynchronous plans */
+	int			as_nasyncplans; /* # of asynchronous plans */
 	AsyncRequest **as_asyncrequests;	/* array of AsyncRequests */
 	TupleTableSlot **as_asyncresults;	/* unreturned results of async plans */
 	int			as_nasyncresults;	/* # of valid entries in as_asyncresults */
 	bool		as_syncdone;	/* true if all synchronous plans done in
 								 * asynchronous mode, else false */
 	int			as_nasyncremain;	/* # of remaining asynchronous plans */
-	Bitmapset  *as_needrequest;	/* asynchronous plans needing a new request */
-	struct WaitEventSet *as_eventset;	/* WaitEventSet used to configure
-										 * file descriptor wait events */
+	Bitmapset  *as_needrequest; /* asynchronous plans needing a new request */
+	struct WaitEventSet *as_eventset;	/* WaitEventSet used to configure file
+										 * descriptor wait events */
 	int			as_first_partial_plan;	/* Index of 'appendplans' containing
 										 * the first partial plan */
 	ParallelAppendState *as_pstate; /* parallel coordination info */
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index fea3123251..ef73342019 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -1929,7 +1929,7 @@ typedef enum AlterTableType
 	AT_GenericOptions,			/* OPTIONS (...) */
 	AT_AttachPartition,			/* ATTACH PARTITION */
 	AT_DetachPartition,			/* DETACH PARTITION */
-	AT_DetachPartitionFinalize,	/* DETACH PARTITION FINALIZE */
+	AT_DetachPartitionFinalize, /* DETACH PARTITION FINALIZE */
 	AT_AddIdentity,				/* ADD IDENTITY */
 	AT_SetIdentity,				/* SET identity column options */
 	AT_DropIdentity,			/* DROP IDENTITY */
diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index a65bda7e3c..b7b2817a5d 100644
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -1103,7 +1103,7 @@ typedef struct PathTarget
 	Index	   *sortgrouprefs;	/* corresponding sort/group refnos, or 0 */
 	QualCost	cost;			/* cost of evaluating the expressions */
 	int			width;			/* estimated avg width of result tuples */
-	VolatileFunctionStatus	has_volatile_expr;	/* indicates if exprs contain
+	VolatileFunctionStatus has_volatile_expr;	/* indicates if exprs contain
 												 * any volatile functions. */
 } PathTarget;
 
@@ -2054,7 +2054,7 @@ typedef struct RestrictInfo
 
 	bool		leakproof;		/* true if known to contain no leaked Vars */
 
-	VolatileFunctionStatus	has_volatile;	/* to indicate if clause contains
+	VolatileFunctionStatus has_volatile;	/* to indicate if clause contains
 											 * any volatile functions. */
 
 	Index		security_level; /* see comment above */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 841401be20..57f320a175 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -132,7 +132,7 @@ typedef struct Plan
 	/*
 	 * information needed for asynchronous execution
 	 */
-	bool		async_capable; 	/* engage asynchronous-capable logic? */
+	bool		async_capable;	/* engage asynchronous-capable logic? */
 
 	/*
 	 * Common structural data for all Plan types.
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index 42ee43f0aa..27da86e5e0 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -357,8 +357,8 @@
  * memory even when clobber is off, or to 0 to never free relation cache
  * memory even when clobbering is on.
  */
-/* #define RECOVER_RELATION_BUILD_MEMORY 0 */ /* Force disable */
-/* #define RECOVER_RELATION_BUILD_MEMORY 1 */ /* Force enable */
+ /* #define RECOVER_RELATION_BUILD_MEMORY 0 */	/* Force disable */
+ /* #define RECOVER_RELATION_BUILD_MEMORY 1 */	/* Force enable */
 
 /*
  * Define this to force all parse and plan trees to be passed through
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 72ff4a06d6..5fbd3a05ba 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -13,12 +13,12 @@
 
 #include "datatype/timestamp.h"
 #include "portability/instr_time.h"
-#include "postmaster/pgarch.h" /* for MAX_XFN_CHARS */
+#include "postmaster/pgarch.h"	/* for MAX_XFN_CHARS */
 #include "utils/backend_progress.h" /* for backward compatibility */
-#include "utils/backend_status.h" /* for backward compatibility */
+#include "utils/backend_status.h"	/* for backward compatibility */
 #include "utils/hsearch.h"
 #include "utils/relcache.h"
-#include "utils/wait_event.h" /* for backward compatibility */
+#include "utils/wait_event.h"	/* for backward compatibility */
 
 
 /* ----------
@@ -379,7 +379,7 @@ typedef struct PgStat_MsgResetslrucounter
 typedef struct PgStat_MsgResetreplslotcounter
 {
 	PgStat_MsgHdr m_hdr;
-	NameData      m_slotname;
+	NameData	m_slotname;
 	bool		clearall;
 } PgStat_MsgResetreplslotcounter;
 
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 328473bdc9..5b3c280dd7 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -45,10 +45,11 @@
 
 #include <dirent.h>
 
-typedef enum RecoveryInitSyncMethod {
+typedef enum RecoveryInitSyncMethod
+{
 	RECOVERY_INIT_SYNC_METHOD_FSYNC,
 	RECOVERY_INIT_SYNC_METHOD_SYNCFS
-} RecoveryInitSyncMethod;
+}			RecoveryInitSyncMethod;
 
 struct iovec;					/* avoid including port/pg_iovec.h here */
 
@@ -58,7 +59,7 @@ typedef int File;
 /* GUC parameter */
 extern PGDLLIMPORT int max_files_per_process;
 extern PGDLLIMPORT bool data_sync_retry;
-extern int recovery_init_sync_method;
+extern int	recovery_init_sync_method;
 
 /*
  * This is private to fd.c, but exported for save/restore_backend_variables()
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 2fd1ff09a7..be67d8a861 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -38,9 +38,9 @@
 typedef struct XidCacheStatus
 {
 	/* number of cached subxids, never more than PGPROC_MAX_CACHED_SUBXIDS */
-	uint8	count;
+	uint8		count;
 	/* has PGPROC->subxids overflowed */
-	bool	overflowed;
+	bool		overflowed;
 } XidCacheStatus;
 
 struct XidCache
@@ -145,8 +145,8 @@ struct PGPROC
 								 * else InvalidLocalTransactionId */
 	int			pid;			/* Backend's process ID; 0 if prepared xact */
 
-	int			pgxactoff;		/* offset into various ProcGlobal->arrays
-								 * with data mirrored from this PGPROC */
+	int			pgxactoff;		/* offset into various ProcGlobal->arrays with
+								 * data mirrored from this PGPROC */
 	int			pgprocno;
 
 	/* These fields are zero while a backend is still starting up: */
@@ -207,8 +207,8 @@ struct PGPROC
 	 */
 	SHM_QUEUE	myProcLocks[NUM_LOCK_PARTITIONS];
 
-	XidCacheStatus subxidStatus; /* mirrored with
-								  * ProcGlobal->subxidStates[i] */
+	XidCacheStatus subxidStatus;	/* mirrored with
+									 * ProcGlobal->subxidStates[i] */
 	struct XidCache subxids;	/* cache for subtransaction XIDs */
 
 	/* Support for group XID clearing. */
diff --git a/src/include/utils/backend_progress.h b/src/include/utils/backend_progress.h
index 1714fa09c1..53bddf665b 100644
--- a/src/include/utils/backend_progress.h
+++ b/src/include/utils/backend_progress.h
@@ -41,4 +41,4 @@ extern void pgstat_progress_update_multi_param(int nparam, const int *index,
 extern void pgstat_progress_end_command(void);
 
 
-#endif /* BACKEND_PROGRESS_H */
+#endif							/* BACKEND_PROGRESS_H */
diff --git a/src/include/utils/backend_status.h b/src/include/utils/backend_status.h
index 0cbcc9c943..8042b817df 100644
--- a/src/include/utils/backend_status.h
+++ b/src/include/utils/backend_status.h
@@ -12,7 +12,7 @@
 
 #include "datatype/timestamp.h"
 #include "libpq/pqcomm.h"
-#include "miscadmin.h" /* for BackendType */
+#include "miscadmin.h"			/* for BackendType */
 #include "utils/backend_progress.h"
 
 
@@ -273,7 +273,7 @@ extern PGDLLIMPORT int pgstat_track_activity_query_size;
  * Other global variables
  * ----------
  */
-extern PGDLLIMPORT  PgBackendStatus *MyBEEntry;
+extern PGDLLIMPORT PgBackendStatus *MyBEEntry;
 
 
 /* ----------
@@ -318,4 +318,4 @@ extern LocalPgBackendStatus *pgstat_fetch_stat_local_beentry(int beid);
 extern char *pgstat_clip_activity(const char *raw_activity);
 
 
-#endif /* BACKEND_STATUS_H */
+#endif							/* BACKEND_STATUS_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 27d2f2ffb3..f3ce4fb173 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -35,18 +35,18 @@ extern int	errdomainconstraint(Oid datatypeOid, const char *conname);
 extern int2vector *buildint2vector(const int16 *int2s, int n);
 
 /* name.c */
-extern void	namestrcpy(Name name, const char *str);
+extern void namestrcpy(Name name, const char *str);
 extern int	namestrcmp(Name name, const char *str);
 
 /* numutils.c */
 extern int32 pg_atoi(const char *s, int size, int c);
 extern int16 pg_strtoint16(const char *s);
 extern int32 pg_strtoint32(const char *s);
-extern int pg_itoa(int16 i, char *a);
-extern int pg_ultoa_n(uint32 l, char *a);
-extern int pg_ulltoa_n(uint64 l, char *a);
-extern int pg_ltoa(int32 l, char *a);
-extern int pg_lltoa(int64 ll, char *a);
+extern int	pg_itoa(int16 i, char *a);
+extern int	pg_ultoa_n(uint32 l, char *a);
+extern int	pg_ulltoa_n(uint64 l, char *a);
+extern int	pg_ltoa(int32 l, char *a);
+extern int	pg_lltoa(int64 ll, char *a);
 extern char *pg_ultostr_zeropad(char *str, uint32 value, int32 minwidth);
 extern char *pg_ultostr(char *str, uint32 value);
 extern uint64 pg_strtouint64(const char *str, char **endptr, int base);
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
index 78cde58acc..9dd444e1ff 100644
--- a/src/include/utils/selfuncs.h
+++ b/src/include/utils/selfuncs.h
@@ -79,7 +79,7 @@
 
 typedef struct EstimationInfo
 {
-	uint32			flags;		/* Flags, as defined above to mark special
+	uint32		flags;			/* Flags, as defined above to mark special
 								 * properties of the estimation. */
 } EstimationInfo;
 
diff --git a/src/include/utils/wait_event.h b/src/include/utils/wait_event.h
index 47accc5ffe..6c6ec2e711 100644
--- a/src/include/utils/wait_event.h
+++ b/src/include/utils/wait_event.h
@@ -281,4 +281,4 @@ pgstat_report_wait_end(void)
 }
 
 
-#endif /* WAIT_EVENT_H */
+#endif							/* WAIT_EVENT_H */