diff -U3 /tmp/cirrus-ci-build/contrib/amcheck/expected/check_btree.out /tmp/cirrus-ci-build/build/testrun/amcheck/regress/results/check_btree.out
--- /tmp/cirrus-ci-build/contrib/amcheck/expected/check_btree.out	2024-03-28 13:35:03.852741000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/amcheck/regress/results/check_btree.out	2024-03-28 13:52:41.385137000 +0000
@@ -8,8 +8,11 @@
 ALTER TABLE bttest_multi SET (autovacuum_enabled = false);
 ALTER TABLE delete_test_table SET (autovacuum_enabled = false);
 INSERT INTO bttest_a SELECT * FROM generate_series(1, 100000);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 INSERT INTO bttest_b SELECT * FROM generate_series(100000, 1, -1);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 INSERT INTO bttest_multi SELECT i, i%2  FROM generate_series(1, 100000) as i;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 CREATE INDEX bttest_a_idx ON bttest_a USING btree (id) WITH (deduplicate_items = ON);
 CREATE INDEX bttest_b_idx ON bttest_b USING btree (id);
 CREATE UNIQUE INDEX bttest_multi_idx ON bttest_multi
@@ -97,6 +100,7 @@
 SELECT * FROM pg_locks
 WHERE relation = ANY(ARRAY['bttest_a', 'bttest_a_idx', 'bttest_b', 'bttest_b_idx']::regclass[])
     AND pid = pg_backend_pid();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  locktype | database | relation | page | tuple | virtualxid | transactionid | classid | objid | objsubid | virtualtransaction | pid | mode | granted | fastpath | waitstart 
 ----------+----------+----------+------+-------+------------+---------------+---------+-------+----------+--------------------+-----+------+---------+----------+-----------
 (0 rows)
@@ -105,6 +109,7 @@
 -- Deduplication
 TRUNCATE bttest_a;
 INSERT INTO bttest_a SELECT 42 FROM generate_series(1, 2000);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 SELECT bt_index_check('bttest_a_idx', true);
  bt_index_check 
 ----------------
@@ -128,6 +133,7 @@
 -- repeat expansive tests for index built using insertions
 TRUNCATE bttest_multi;
 INSERT INTO bttest_multi SELECT i, i%2  FROM generate_series(1, 100000) as i;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 SELECT bt_index_parent_check('bttest_multi_idx', true, true);
  bt_index_parent_check 
 -----------------------
@@ -139,6 +145,7 @@
 -- checks
 --
 INSERT INTO delete_test_table SELECT i, 1, 2, 3 FROM generate_series(1,80000) i;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ALTER TABLE delete_test_table ADD PRIMARY KEY (a,b,c,d);
 -- Delete most entries, and vacuum, deleting internal pages and creating "fast
 -- root"
@@ -170,6 +177,7 @@
 
 -- Insert compressible heap tuple (comfortably exceeds TOAST_TUPLE_THRESHOLD):
 INSERT INTO toast_bug SELECT repeat('a', 2200);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 -- Should not get false positive report of corruption:
 SELECT bt_index_check('toasty', true);
  bt_index_check 
@@ -182,6 +190,7 @@
 --
 TRUNCATE bttest_a;
 INSERT INTO bttest_a SELECT * FROM generate_series(1, 1000);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ALTER TABLE bttest_a OWNER TO regress_bttest_role;
 -- A dummy index function checking current_user
 CREATE FUNCTION ifun(int8) RETURNS int8 AS $$
diff -U3 /tmp/cirrus-ci-build/contrib/amcheck/expected/check_heap.out /tmp/cirrus-ci-build/build/testrun/amcheck/regress/results/check_heap.out
--- /tmp/cirrus-ci-build/contrib/amcheck/expected/check_heap.out	2024-03-28 13:35:03.852869000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/amcheck/regress/results/check_heap.out	2024-03-28 13:52:41.456179000 +0000
@@ -2,15 +2,18 @@
 REVOKE ALL ON heaptest FROM PUBLIC;
 -- Check that invalid skip option is rejected
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'rope');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  invalid skip option
 HINT:  Valid skip options are "all-visible", "all-frozen", and "none".
 -- Check specifying invalid block ranges when verifying an empty table
 SELECT * FROM verify_heapam(relation := 'heaptest', startblock := 0, endblock := 0);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', startblock := 5, endblock := 8);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -18,46 +21,55 @@
 -- Check that valid options are not rejected nor corruption reported
 -- for an empty table, and that skip enum-like parameter is case-insensitive
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'none');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'all-frozen');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'all-visible');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'None');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'All-Frozen');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'All-Visible');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'NONE');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'ALL-FROZEN');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'ALL-VISIBLE');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -66,6 +78,7 @@
 INSERT INTO heaptest (a, b)
 	(SELECT gs, repeat('x', gs)
 		FROM generate_series(1,50) gs);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 -- pg_stat_io test:
 -- verify_heapam always uses a BAS_BULKREAD BufferAccessStrategy, whereas a
 -- sequential scan does so only if the table is large enough when compared to
@@ -84,26 +97,31 @@
 CREATE TABLESPACE regress_test_stats_tblspc LOCATION '';
 SELECT sum(reads) AS stats_bulkreads_before
   FROM pg_stat_io WHERE context = 'bulkread' \gset
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 BEGIN;
 ALTER TABLE heaptest SET TABLESPACE regress_test_stats_tblspc;
 -- Check that valid options are not rejected nor corruption reported
 -- for a non-empty table
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'none');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'all-frozen');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'all-visible');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', startblock := 0, endblock := 0);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -120,6 +138,7 @@
 
 SELECT sum(reads) AS stats_bulkreads_after
   FROM pg_stat_io WHERE context = 'bulkread' \gset
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 SELECT :stats_bulkreads_after > :stats_bulkreads_before;
  ?column? 
 ----------
@@ -130,12 +149,14 @@
 -- verify permissions are checked (error due to function not callable)
 SET ROLE regress_heaptest_role;
 SELECT * FROM verify_heapam(relation := 'heaptest');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  permission denied for function verify_heapam
 RESET ROLE;
 GRANT EXECUTE ON FUNCTION verify_heapam(regclass, boolean, boolean, text, bigint, bigint) TO regress_heaptest_role;
 -- verify permissions are now sufficient
 SET ROLE regress_heaptest_role;
 SELECT * FROM verify_heapam(relation := 'heaptest');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -143,29 +164,35 @@
 RESET ROLE;
 -- Check specifying invalid block ranges when verifying a non-empty table.
 SELECT * FROM verify_heapam(relation := 'heaptest', startblock := 0, endblock := 10000);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  ending block number must be between 0 and 0
 SELECT * FROM verify_heapam(relation := 'heaptest', startblock := 10000, endblock := 11000);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  starting block number must be between 0 and 0
 -- Vacuum freeze to change the xids encountered in subsequent tests
 VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) heaptest;
 -- Check that valid options are not rejected nor corruption reported
 -- for a non-empty frozen table
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'none');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'all-frozen');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', skip := 'all-visible');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
 
 SELECT * FROM verify_heapam(relation := 'heaptest', startblock := 0, endblock := 0);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -177,6 +204,7 @@
 SELECT * FROM verify_heapam('test_partitioned',
 							startblock := NULL,
 							endblock := NULL);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  cannot check relation "test_partitioned"
 DETAIL:  This operation is not supported for partitioned tables.
 -- Check that valid options are not rejected nor corruption reported
@@ -185,6 +213,7 @@
 SELECT * FROM verify_heapam('test_partition',
 							startblock := NULL,
 							endblock := NULL);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -192,9 +221,11 @@
 -- Check that valid options are not rejected nor corruption reported
 -- for a non-empty partition table (the child one)
 INSERT INTO test_partitioned (a) (SELECT 1 FROM generate_series(1,1000) gs);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 SELECT * FROM verify_heapam('test_partition',
 							startblock := NULL,
 							endblock := NULL);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -204,6 +235,7 @@
 SELECT * FROM verify_heapam('test_index',
 							startblock := NULL,
 							endblock := NULL);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  cannot check relation "test_index"
 DETAIL:  This operation is not supported for indexes.
 -- Check that views are rejected
@@ -211,6 +243,7 @@
 SELECT * FROM verify_heapam('test_view',
 							startblock := NULL,
 							endblock := NULL);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  cannot check relation "test_view"
 DETAIL:  This operation is not supported for views.
 -- Check that sequences are rejected
@@ -218,6 +251,7 @@
 SELECT * FROM verify_heapam('test_sequence',
 							startblock := NULL,
 							endblock := NULL);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  blkno | offnum | attnum | msg 
 -------+--------+--------+-----
 (0 rows)
@@ -229,6 +263,7 @@
 SELECT * FROM verify_heapam('test_foreign_table',
 							startblock := NULL,
 							endblock := NULL);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 ERROR:  cannot check relation "test_foreign_table"
 DETAIL:  This operation is not supported for foreign tables.
 -- cleanup