diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/select.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out	2024-03-29 10:06:46.556836000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/select.out	2024-03-29 10:24:50.110934000 +0000
@@ -91,6 +91,7 @@
 
 -- set operator
 SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  i 
 ---
  1
@@ -109,6 +110,7 @@
   VALUES (1.0), (2.0)
 )
   SELECT f FROM t ORDER BY f;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
   f  
 -----
  1.0
@@ -125,6 +127,7 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                    query                                     
 -------+------+------------------------------------------------------------------------------
      1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
@@ -165,64 +168,76 @@
 
 -- control query
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 -- test range tables
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR UPDATE;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR UPDATE OF pgss_a;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR UPDATE OF pgss_b;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR UPDATE OF pgss_a, pgss_b; -- matches plain "FOR UPDATE"
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR UPDATE OF pgss_b, pgss_a;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 -- test strengths
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR NO KEY UPDATE;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR SHARE;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR KEY SHARE;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 -- test wait policies
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR UPDATE NOWAIT;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id FOR UPDATE SKIP LOCKED;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  id | id | a_id 
 ----+----+------
 (0 rows)
 
 SELECT calls, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls |                                          query                                           
 -------+------------------------------------------------------------------------------------------
      1 | SELECT * FROM pgss_a JOIN pgss_b ON pgss_b.a_id = pgss_a.id
@@ -250,6 +265,7 @@
 (1 row)
 
 SELECT dealloc FROM pg_stat_statements_info;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  dealloc 
 ---------
        0
@@ -259,6 +275,7 @@
 CREATE TABLE tbl_inh(id integer);
 CREATE TABLE tbl_inh_1() INHERITS (tbl_inh);
 INSERT INTO tbl_inh_1 SELECT 1;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 SELECT * FROM tbl_inh;
  id 
 ----
@@ -271,6 +288,7 @@
 (0 rows)
 
 SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FROM%tbl_inh%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  count 
 -------
      2
@@ -278,6 +296,7 @@
 
 -- WITH TIES
 CREATE TABLE limitoption AS SELECT 0 AS val FROM generate_series(1, 10);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 SELECT *
 FROM limitoption
 WHERE val < 2
@@ -309,6 +328,7 @@
 (2 rows)
 
 SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FETCH FIRST%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  count 
 -------
      2
@@ -319,6 +339,7 @@
 FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
 GROUP BY ROLLUP(a, b), rollup(a, c)
 ORDER BY a, b, c;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  a | b | c 
 ---+---+---
  1 | 2 | 3
@@ -352,6 +373,7 @@
 FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
 GROUP BY DISTINCT ROLLUP(a, b), rollup(a, c)
 ORDER BY a, b, c;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  a | b | c 
 ---+---+---
  1 | 2 | 3
@@ -370,6 +392,7 @@
 (13 rows)
 
 SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%GROUP BY%ROLLUP%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  count 
 -------
      2
@@ -381,6 +404,7 @@
     SELECT GROUPING(a,b) FROM (VALUES (1)) v2(c)
   ) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
 ) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  grouping 
 ----------
         0
@@ -393,6 +417,7 @@
     SELECT GROUPING(e,f) FROM (VALUES (1)) v2(c)
   ) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
 ) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  grouping 
 ----------
         3
@@ -401,6 +426,7 @@
 (3 rows)
 
 SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%SELECT GROUPING%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  count 
 -------
      2
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/dml.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/dml.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/dml.out	2024-03-29 10:06:46.556327000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/dml.out	2024-03-29 10:24:50.145592000 +0000
@@ -21,6 +21,7 @@
 COMMIT ;
 -- many INSERT values
 INSERT INTO pgss_dml_tab (a, b) VALUES (1, 'a'), (2, 'b'), (3, 'c');
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 -- SELECT with constants
 SELECT * FROM pgss_dml_tab WHERE a > 5 ORDER BY a ;
  a |          b           
@@ -73,6 +74,7 @@
 (8 rows)
 
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                query                                
 -------+------+---------------------------------------------------------------------
      1 |    1 | DELETE FROM pgss_dml_tab WHERE a > $1
@@ -116,6 +118,7 @@
  WHEN NOT MATCHED THEN DO NOTHING;
 DROP TABLE pgss_dml_tab;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                          query                                          
 -------+------+-----------------------------------------------------------------------------------------
      1 |    6 | MERGE INTO pgss_dml_tab USING pgss_dml_tab st ON (st.a = pgss_dml_tab.a AND st.a >= $1)+
@@ -149,7 +152,9 @@
 (1 row)
 
 INSERT INTO pgss_extend_tab (a, b) SELECT generate_series(1, 1000), 'something';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 INSERT INTO pgss_extend_temp_tab (a, b) SELECT generate_series(1, 1000), 'something';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 WITH sizes AS (
   SELECT
     pg_relation_size('pgss_extend_tab') / current_setting('block_size')::int8 AS rel_size,
@@ -161,6 +166,7 @@
     SUM(shared_blks_written) >= (SELECT rel_size FROM sizes) AS written_ok,
     SUM(shared_blks_dirtied) >= (SELECT rel_size FROM sizes) AS dirtied_ok
 FROM pg_stat_statements;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  temp_written_ok | temp_dirtied_ok | written_ok | dirtied_ok 
 -----------------+-----------------+------------+------------
  t               | t               | t          | t
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/cursors.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/cursors.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/cursors.out	2024-03-29 10:06:46.556215000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/cursors.out	2024-03-29 10:24:50.158714000 +0000
@@ -16,6 +16,7 @@
 DECLARE cursor_stats_1 CURSOR WITH HOLD FOR SELECT 2;
 CLOSE cursor_stats_1;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                         query                         
 -------+------+-------------------------------------------------------
      2 |    0 | CLOSE cursor_stats_1
@@ -49,6 +50,7 @@
 CLOSE cursor_stats_2;
 COMMIT;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                         query                         
 -------+------+-------------------------------------------------------
      1 |    0 | BEGIN
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/utility.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/utility.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/utility.out	2024-03-29 10:06:46.557153000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/utility.out	2024-03-29 10:24:50.263089000 +0000
@@ -24,6 +24,7 @@
 NOTICE:  table "tab_stats" does not exist, skipping
 NOTICE:  table "tab_stats" does not exist, skipping
 NOTICE:  table "tab_stats" does not exist, skipping
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                        query                                         
 -------+------+--------------------------------------------------------------------------------------
      1 |    0 | ALTER TABLE tab_stats ADD CONSTRAINT a_nonzero CHECK (a <> 0)
@@ -96,6 +97,7 @@
 CREATE STATISTICS tab_expr_stats_1 (mcv) ON a, (2*a), (3*b) FROM tab_expr_stats;
 DROP TABLE tab_expr_stats;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                        query                                        
 -------+------+-------------------------------------------------------------------------------------
      1 |    0 | ALTER FOREIGN TABLE foreign_stats ADD COLUMN b integer DEFAULT 1
@@ -179,6 +181,7 @@
 BEGIN TRANSACTION NOT DEFERRABLE, READ ONLY, READ WRITE, DEFERRABLE;
 COMMIT;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                query                                
 -------+------+---------------------------------------------------------------------
      4 |    0 | ABORT
@@ -205,6 +208,7 @@
 PREPARE TRANSACTION 'stat_trans2';
 ROLLBACK PREPARED 'stat_trans2';
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                       query                        
 -------+------+----------------------------------------------------
      2 |    0 | BEGIN
@@ -235,6 +239,7 @@
 RELEASE SAVEPOINT sp1;
 COMMIT;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                       query                        
 -------+------+----------------------------------------------------
      1 |    0 | BEGIN
@@ -266,6 +271,7 @@
 (1 row)
 
 EXPLAIN (costs off) SELECT a FROM generate_series(1,10) AS tab(a) WHERE a = 3;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
               QUERY PLAN              
 --------------------------------------
  Function Scan on generate_series tab
@@ -273,6 +279,7 @@
 (2 rows)
 
 EXPLAIN (costs off) SELECT a FROM generate_series(1,10) AS tab(a) WHERE a = 7;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
               QUERY PLAN              
 --------------------------------------
  Function Scan on generate_series tab
@@ -280,6 +287,7 @@
 (2 rows)
 
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                      query                                      
 -------+------+---------------------------------------------------------------------------------
      2 |    0 | EXPLAIN (costs off) SELECT $1
@@ -346,6 +354,7 @@
 (1 row)
 
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                       query                        
 -------+------+----------------------------------------------------
      2 |    0 | CALL in_out($1, $2, $3)
@@ -382,6 +391,7 @@
 COPY (DELETE FROM copy_stats WHERE a = 1 RETURNING *) TO STDOUT;
 1	4
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                               query                               
 -------+------+-------------------------------------------------------------------
      1 |    1 | COPY (DELETE FROM copy_stats WHERE a = 1 RETURNING *) TO STDOUT
@@ -410,12 +420,15 @@
 CREATE TABLE ctas_stats_2 AS
   SELECT a AS col1, 2::int AS col2
     FROM generate_series(1, 10) AS tab(a) WHERE a < 5 AND a > 2;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 DROP TABLE ctas_stats_2;
 CREATE TABLE ctas_stats_2 AS
   SELECT a AS col1, 4::int AS col2
     FROM generate_series(1, 5) AS tab(a) WHERE a < 4 AND a > 1;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 DROP TABLE ctas_stats_2;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                               query                                
 -------+------+--------------------------------------------------------------------
      2 |    2 | CREATE TABLE ctas_stats_1 AS SELECT $1 AS a
@@ -438,12 +451,15 @@
 CREATE MATERIALIZED VIEW matview_stats_1 AS
   SELECT a AS col1, 2::int AS col2
     FROM generate_series(1, 10) AS tab(a) WHERE a < 5 AND a > 2;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 DROP MATERIALIZED VIEW matview_stats_1;
 CREATE MATERIALIZED VIEW matview_stats_1 AS
   SELECT a AS col1, 4::int AS col2
     FROM generate_series(1, 5) AS tab(a) WHERE a < 4 AND a > 3;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 DROP MATERIALIZED VIEW matview_stats_1;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                               query                                
 -------+------+--------------------------------------------------------------------
      2 |    2 | CREATE MATERIALIZED VIEW matview_stats_1 AS                       +
@@ -469,6 +485,7 @@
     FROM generate_series(1, 5) AS tab(a) WHERE a < 4 AND a > 3;
 DROP VIEW view_stats_1;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                              query                              
 -------+------+-----------------------------------------------------------------
      1 |    0 | CREATE VIEW view_stats_1 AS                                    +
@@ -493,6 +510,7 @@
 ALTER DOMAIN domain_stats ADD CONSTRAINT higher_than_one CHECK (VALUE > 1);
 DROP DOMAIN domain_stats;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                   query                                    
 -------+------+----------------------------------------------------------------------------
      1 |    0 | ALTER DOMAIN domain_stats ADD CONSTRAINT higher_than_one CHECK (VALUE > 1)
@@ -534,6 +552,7 @@
 DEALLOCATE ALL;
 DEALLOCATE PREPARE ALL;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                       query                        
 -------+------+----------------------------------------------------
      2 |    0 | DEALLOCATE $1
@@ -572,6 +591,7 @@
 RESET SESSION AUTHORIZATION;
 COMMIT;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                       query                        
 -------+------+----------------------------------------------------
      2 |    0 | BEGIN
@@ -603,6 +623,7 @@
 -- REFRESH MATERIALIZED VIEW and SELECT INTO
 --
 CREATE TABLE pgss_ctas AS SELECT a, 'ctas' b FROM generate_series(1, 10) a;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 SELECT generate_series(1, 10) c INTO pgss_select_into;
 COPY pgss_ctas (a, b) FROM STDIN;
 CREATE MATERIALIZED VIEW pgss_matv AS SELECT * FROM pgss_ctas;
@@ -639,6 +660,7 @@
 
 COMMIT;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                                  query                                  
 -------+------+-------------------------------------------------------------------------
      1 |    0 | BEGIN
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out	2024-03-29 10:06:46.556498000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-03-29 10:24:50.297844000 +0000
@@ -19,6 +19,7 @@
 $$ LANGUAGE plpgsql;
 SELECT toplevel, calls, query FROM pg_stat_statements
   WHERE query LIKE '%DELETE%' ORDER BY query COLLATE "C", toplevel;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  toplevel | calls |             query              
 ----------+-------+--------------------------------
  t        |     1 | DELETE FROM stats_track_tab
@@ -49,6 +50,7 @@
 END; $$;
 SELECT toplevel, calls, query FROM pg_stat_statements
   ORDER BY query COLLATE "C", toplevel;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  toplevel | calls |                       query                        
 ----------+-------+----------------------------------------------------
  f        |     1 | DELETE FROM stats_track_tab
@@ -88,6 +90,7 @@
 END; $$;
 SELECT toplevel, calls, query FROM pg_stat_statements
   ORDER BY query COLLATE "C", toplevel;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  toplevel | calls |                       query                        
 ----------+-------+----------------------------------------------------
  t        |     1 | DELETE FROM stats_track_tab
@@ -114,6 +117,7 @@
 END; $$;
 SELECT toplevel, calls, query FROM pg_stat_statements
   ORDER BY query COLLATE "C", toplevel;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  toplevel | calls |                       query                        
 ----------+-------+----------------------------------------------------
  f        |     1 | DELETE FROM stats_track_tab
@@ -166,6 +170,7 @@
 (1 row)
 
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                       query                        
 -------+------+----------------------------------------------------
      2 |    2 | SELECT PLUS_ONE($1)
@@ -189,6 +194,7 @@
 (1 row)
 
 SELECT toplevel, calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  toplevel | calls | rows |                                    query                                     
 ----------+-------+------+------------------------------------------------------------------------------
  t        |     2 |    2 | SELECT PLUS_ONE($1)
@@ -246,6 +252,7 @@
 (1 row)
 
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows |                       query                        
 -------+------+----------------------------------------------------
      2 |    2 | SELECT (i + $2 + $3)::INTEGER
@@ -271,6 +278,7 @@
 (1 row)
 
 SELECT toplevel, calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  toplevel | calls | rows |                                    query                                     
 ----------+-------+------+------------------------------------------------------------------------------
  f        |     2 |    2 | SELECT (i + $2 + $3)::INTEGER
@@ -306,6 +314,7 @@
 (1 row)
 
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  calls | rows | query 
 -------+------+-------
 (0 rows)
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/planning.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/planning.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/planning.out	2024-03-29 10:06:46.556722000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/planning.out	2024-03-29 10:24:50.316846000 +0000
@@ -59,6 +59,7 @@
 
 SELECT plans, calls, rows, query FROM pg_stat_statements
   WHERE query NOT LIKE 'PREPARE%' ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  plans | calls | rows |                          query                           
 -------+-------+------+----------------------------------------------------------
      0 |     1 |    0 | ALTER TABLE stats_plan_test ADD COLUMN x int
@@ -73,6 +74,7 @@
 -- invalidations could force more
 SELECT plans >= 2 AND plans <= calls AS plans_ok, calls, rows, query FROM pg_stat_statements
   WHERE query LIKE 'PREPARE%' ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  plans_ok | calls | rows |                         query                         
 ----------+-------+------+-------------------------------------------------------
  t        |     4 |    4 | PREPARE prep1 AS SELECT COUNT(*) FROM stats_plan_test
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/user_activity.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/user_activity.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/user_activity.out	2024-03-29 10:06:46.556931000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/user_activity.out	2024-03-29 10:24:50.341583000 +0000
@@ -39,6 +39,7 @@
 
 RESET ROLE;
 SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                        query                        | calls | rows 
 ----------------------------------------------------+-------+------
  CREATE ROLE regress_stats_user1                    |     1 |    0
@@ -63,6 +64,7 @@
 (1 row)
 
 SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                                     query                                     | calls | rows 
 ------------------------------------------------------------------------------+-------+------
  CREATE ROLE regress_stats_user1                                              |     1 |    0
@@ -89,12 +91,14 @@
 	(SELECT s.queryid FROM pg_stat_statements AS s
 				WHERE s.query = 'SELECT $1+$2 AS "TWO"' LIMIT 1))
 	IS NOT NULL AS t;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  t 
 ---
  t
 (1 row)
 
 SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                                       query                                       | calls | rows 
 ----------------------------------------------------------------------------------+-------+------
  CREATE ROLE regress_stats_user1                                                  |     1 |    0
@@ -121,6 +125,7 @@
 --
 SELECT pg_stat_statements_reset(0,0,s.queryid) IS NOT NULL AS t
 	FROM pg_stat_statements AS s WHERE s.query = 'SELECT $1 AS "ONE"';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  t 
 ---
  t
@@ -128,6 +133,7 @@
 (2 rows)
 
 SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                                       query                                       | calls | rows 
 ----------------------------------------------------------------------------------+-------+------
  CREATE ROLE regress_stats_user1                                                  |     1 |    0
@@ -154,12 +160,14 @@
 --
 SELECT pg_stat_statements_reset(r.oid) IS NOT NULL AS t
 		FROM pg_roles AS r WHERE r.rolname = 'regress_stats_user1';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  t 
 ---
  t
 (1 row)
 
 SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                                       query                                       | calls | rows 
 ----------------------------------------------------------------------------------+-------+------
  CREATE ROLE regress_stats_user1                                                  |     1 |    0
@@ -191,6 +199,7 @@
 (1 row)
 
 SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                           query                          | calls | rows 
 ---------------------------------------------------------+-------+------
  SELECT pg_stat_statements_reset(0,0,0) IS NOT NULL AS t |     1 |    1
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/wal.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out	2024-03-29 10:06:46.557205000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/wal.out	2024-03-29 10:24:50.360511000 +0000
@@ -13,6 +13,7 @@
 wal_records > 0 as wal_records_generated,
 wal_records >= rows as wal_records_ge_rows
 FROM pg_stat_statements ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                             query                             | calls | rows | wal_bytes_generated | wal_records_generated | wal_records_ge_rows 
 --------------------------------------------------------------+-------+------+---------------------+-----------------------+---------------------
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                     | t
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/entry_timestamp.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/entry_timestamp.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/entry_timestamp.out	2024-03-29 10:06:46.556402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/entry_timestamp.out	2024-03-29 10:24:50.384116000 +0000
@@ -20,6 +20,7 @@
 WHERE query LIKE '%STMTTS%'
 GROUP BY stats_since >= :'ref_ts'
 ORDER BY stats_since >= :'ref_ts';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  ?column? | count 
 ----------+-------
  f        |     1
@@ -43,6 +44,7 @@
   ) as stats_since_after_ref
 FROM pg_stat_statements
 WHERE query LIKE '%STMTTS%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  total | minmax_plan_zero | minmax_exec_zero | minmax_stats_since_after_ref | stats_since_after_ref 
 -------+------------------+------------------+------------------------------+-----------------------
      2 |                0 |                0 |                            0 |                     0
@@ -52,6 +54,7 @@
 SELECT pg_stat_statements_reset(0, 0, queryid, true) AS minmax_reset_ts
 FROM pg_stat_statements
 WHERE query LIKE '%STMTTS1%' \gset
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 -- check
 SELECT
   count(*) as total,
@@ -69,6 +72,7 @@
   ) as stats_since_after_ref
 FROM pg_stat_statements
 WHERE query LIKE '%STMTTS%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  total | minmax_plan_zero | minmax_exec_zero | minmax_stats_since_after_ref | stats_since_after_ref 
 -------+------------------+------------------+------------------------------+-----------------------
      2 |                1 |                1 |                            1 |                     0
@@ -80,6 +84,7 @@
 FROM pg_stat_statements
 WHERE query LIKE '%STMTTS%'
 ORDER BY query COLLATE "C";
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
            query           | reset_ts_match 
 ---------------------------+----------------
  SELECT $1 AS "STMTTS1"    | t
@@ -90,6 +95,7 @@
 SELECT
 stats_reset = :'minmax_reset_ts' AS stats_reset_ts_match
 FROM pg_stat_statements_info;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  stats_reset_ts_match 
 ----------------------
  f
@@ -117,6 +123,7 @@
   ) as stats_since_after_ref
 FROM pg_stat_statements
 WHERE query LIKE '%STMTTS%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  total | minmax_plan_zero | minmax_exec_zero | minmax_ts_after_ref | minmax_ts_match | stats_since_after_ref 
 -------+------------------+------------------+---------------------+-----------------+-----------------------
      2 |                2 |                2 |                   2 |               2 |                     0
@@ -145,6 +152,7 @@
   ) as stats_since_after_ref
 FROM pg_stat_statements
 WHERE query LIKE '%STMTTS%';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  total | minmax_exec_zero | minmax_ts_after_ref | stats_since_after_ref 
 -------+------------------+---------------------+-----------------------
      2 |                1 |                   2 |                     0
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/oldextversions.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/oldextversions.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/oldextversions.out	2024-03-29 10:06:46.556665000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/oldextversions.out	2024-03-29 10:24:50.464599000 +0000
@@ -59,6 +59,8 @@
 (1 row)
 
 \d pg_stat_statements
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                     View "public.pg_stat_statements"
        Column        |       Type       | Collation | Nullable | Default 
 ---------------------+------------------+-----------+----------+---------
@@ -87,6 +89,7 @@
  blk_write_time      | double precision |           |          | 
 
 SELECT count(*) > 0 AS has_data FROM pg_stat_statements;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  has_data 
 ----------
  t
@@ -106,6 +109,8 @@
 (1 row)
 
 \d pg_stat_statements
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                     View "public.pg_stat_statements"
        Column        |       Type       | Collation | Nullable | Default 
 ---------------------+------------------+-----------+----------+---------
@@ -143,6 +148,7 @@
  wal_bytes           | numeric          |           |          | 
 
 SELECT count(*) > 0 AS has_data FROM pg_stat_statements;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  has_data 
 ----------
  t
@@ -163,6 +169,8 @@
 (1 row)
 
 \d pg_stat_statements
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                     View "public.pg_stat_statements"
        Column        |       Type       | Collation | Nullable | Default 
 ---------------------+------------------+-----------+----------+---------
@@ -201,6 +209,7 @@
  wal_bytes           | numeric          |           |          | 
 
 SELECT count(*) > 0 AS has_data FROM pg_stat_statements;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  has_data 
 ----------
  t
@@ -209,6 +218,8 @@
 -- New functions and views for pg_stat_statements in 1.10
 AlTER EXTENSION pg_stat_statements UPDATE TO '1.10';
 \d pg_stat_statements
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                       View "public.pg_stat_statements"
          Column         |       Type       | Collation | Nullable | Default 
 ------------------------+------------------+-----------+----------+---------
@@ -257,6 +268,7 @@
  jit_emission_time      | double precision |           |          | 
 
 SELECT count(*) > 0 AS has_data FROM pg_stat_statements;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  has_data 
 ----------
  t
@@ -265,6 +277,8 @@
 -- New functions and views for pg_stat_statements in 1.11
 AlTER EXTENSION pg_stat_statements UPDATE TO '1.11';
 \d pg_stat_statements
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
                           View "public.pg_stat_statements"
          Column         |           Type           | Collation | Nullable | Default 
 ------------------------+--------------------------+-----------+----------+---------
@@ -319,6 +333,7 @@
  minmax_stats_since     | timestamp with time zone |           |          | 
 
 SELECT count(*) > 0 AS has_data FROM pg_stat_statements;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  has_data 
 ----------
  t