diff -U3 /home/postgres/postgres/src/test/regress/expected/goo.out /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/goo.out
--- /home/postgres/postgres/src/test/regress/expected/goo.out	Fri Jan  9 06:00:58 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/goo.out	Fri Jan  9 06:06:30 2026
@@ -177,66 +177,66 @@
 JOIN t13 ON t11.l = t13.l
 JOIN t14 ON t12.m = t14.m
 JOIN t15 ON t13.n = t15.n;
-                           QUERY PLAN                           
-----------------------------------------------------------------
+                                 QUERY PLAN                                 
+----------------------------------------------------------------------------
  Aggregate
    ->  Hash Join
-         Hash Cond: (t7.h = t9.h)
+         Hash Cond: (t11.l = t13.l)
          ->  Hash Join
-               Hash Cond: (t8.i = t10.i)
+               Hash Cond: (t9.j = t11.j)
                ->  Hash Join
-                     Hash Cond: (t2.c = t4.c)
+                     Hash Cond: (t7.h = t9.h)
                      ->  Hash Join
-                           Hash Cond: (t3.b = t1.b)
+                           Hash Cond: (t8.i = t10.i)
                            ->  Hash Join
-                                 Hash Cond: (t5.f = t7.f)
+                                 Hash Cond: (t2.c = t4.c)
                                  ->  Hash Join
-                                       Hash Cond: (t3.d = t5.d)
-                                       ->  Seq Scan on t3
+                                       Hash Cond: (t3.b = t1.b)
+                                       ->  Hash Join
+                                             Hash Cond: (t5.f = t7.f)
+                                             ->  Hash Join
+                                                   Hash Cond: (t3.d = t5.d)
+                                                   ->  Seq Scan on t3
+                                                   ->  Hash
+                                                         ->  Seq Scan on t5
+                                             ->  Hash
+                                                   ->  Seq Scan on t7
                                        ->  Hash
-                                             ->  Seq Scan on t5
+                                             ->  Hash Join
+                                                   Hash Cond: (t1.a = t2.a)
+                                                   ->  Seq Scan on t1
+                                                   ->  Hash
+                                                         ->  Seq Scan on t2
                                  ->  Hash
-                                       ->  Seq Scan on t7
+                                       ->  Hash Join
+                                             Hash Cond: (t6.g = t8.g)
+                                             ->  Hash Join
+                                                   Hash Cond: (t4.e = t6.e)
+                                                   ->  Seq Scan on t4
+                                                   ->  Hash
+                                                         ->  Seq Scan on t6
+                                             ->  Hash
+                                                   ->  Seq Scan on t8
                            ->  Hash
                                  ->  Hash Join
-                                       Hash Cond: (t1.a = t2.a)
-                                       ->  Seq Scan on t1
+                                       Hash Cond: (t12.k = t10.k)
+                                       ->  Hash Join
+                                             Hash Cond: (t12.m = t14.m)
+                                             ->  Seq Scan on t12
+                                             ->  Hash
+                                                   ->  Seq Scan on t14
                                        ->  Hash
-                                             ->  Seq Scan on t2
+                                             ->  Seq Scan on t10
                      ->  Hash
-                           ->  Hash Join
-                                 Hash Cond: (t6.g = t8.g)
-                                 ->  Hash Join
-                                       Hash Cond: (t4.e = t6.e)
-                                       ->  Seq Scan on t4
-                                       ->  Hash
-                                             ->  Seq Scan on t6
-                                 ->  Hash
-                                       ->  Seq Scan on t8
+                           ->  Seq Scan on t9
                ->  Hash
-                     ->  Hash Join
-                           Hash Cond: (t12.m = t14.m)
-                           ->  Hash Join
-                                 Hash Cond: (t10.k = t12.k)
-                                 ->  Seq Scan on t10
-                                 ->  Hash
-                                       ->  Seq Scan on t12
-                           ->  Hash
-                                 ->  Seq Scan on t14
+                     ->  Seq Scan on t11
          ->  Hash
                ->  Hash Join
-                     Hash Cond: (t11.l = t13.l)
-                     ->  Hash Join
-                           Hash Cond: (t9.j = t11.j)
-                           ->  Seq Scan on t9
-                           ->  Hash
-                                 ->  Seq Scan on t11
+                     Hash Cond: (t13.n = t15.n)
+                     ->  Seq Scan on t13
                      ->  Hash
-                           ->  Hash Join
-                                 Hash Cond: (t13.n = t15.n)
-                                 ->  Seq Scan on t13
-                                 ->  Hash
-                                       ->  Seq Scan on t15
+                           ->  Seq Scan on t15
 (58 rows)
 
 -- Execute to verify correctness
@@ -452,22 +452,22 @@
 FROM t1 JOIN t2 ON t1.a = t2.a,
      t5 JOIN t6 ON t5.f = t6.e
 WHERE t1.a < 5 AND t5.d < 3;
-                      QUERY PLAN                       
--------------------------------------------------------
+                   QUERY PLAN                    
+-------------------------------------------------
  Aggregate
    ->  Hash Join
          Hash Cond: (t2.a = t1.a)
-         ->  Seq Scan on t2
+         ->  Nested Loop
+               ->  Hash Join
+                     Hash Cond: (t6.e = t5.f)
+                     ->  Seq Scan on t6
+                     ->  Hash
+                           ->  Seq Scan on t5
+                                 Filter: (d < 3)
+               ->  Seq Scan on t2
          ->  Hash
-               ->  Nested Loop
-                     ->  Hash Join
-                           Hash Cond: (t6.e = t5.f)
-                           ->  Seq Scan on t6
-                           ->  Hash
-                                 ->  Seq Scan on t5
-                                       Filter: (d < 3)
-                     ->  Seq Scan on t1
-                           Filter: (a < 5)
+               ->  Seq Scan on t1
+                     Filter: (a < 5)
 (14 rows)
 
 --
@@ -605,24 +605,24 @@
 -----------------------------------------------------------------
  Aggregate
    ->  Hash Join
-         Hash Cond: (chain1a.val = chain2a.id)
+         Hash Cond: (chain2a.val = chain2b.id)
          ->  Hash Join
-               Hash Cond: (chain1b.val = chain1c.id)
+               Hash Cond: (chain1a.val = chain2a.id)
                ->  Hash Join
-                     Hash Cond: (chain1a.id = chain1b.id)
-                     ->  Seq Scan on chain1a
-                     ->  Hash
+                     Hash Cond: (chain1b.id = chain1a.id)
+                     ->  Hash Join
+                           Hash Cond: (chain1b.val = chain1c.id)
                            ->  Seq Scan on chain1b
+                           ->  Hash
+                                 ->  Seq Scan on chain1c
+                     ->  Hash
+                           ->  Seq Scan on chain1a
                ->  Hash
-                     ->  Seq Scan on chain1c
+                     ->  Seq Scan on chain2a
          ->  Hash
                ->  Hash Join
                      Hash Cond: (chain2b.val = chain2c.id)
-                     ->  Hash Join
-                           Hash Cond: (chain2a.val = chain2b.id)
-                           ->  Seq Scan on chain2a
-                           ->  Hash
-                                 ->  Seq Scan on chain2b
+                     ->  Seq Scan on chain2b
                      ->  Hash
                            ->  Seq Scan on chain2c
 (22 rows)