diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out
index b56d4e1b440b5bd8ff9cf3739b6ce1eac452049f..d1b440f5a9be3f97a42d6456b3f16690fb39a389 100644
--- a/contrib/intarray/expected/_int.out
+++ b/contrib/intarray/expected/_int.out
@@ -5,223 +5,223 @@
 \set ECHO none
 --test query_int
 select '1'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1
 (1 row)
 
 select ' 1'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1
 (1 row)
 
 select '1 '::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1
 (1 row)
 
 select ' 1 '::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1
 (1 row)
 
 select ' ! 1 '::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  !1
 (1 row)
 
 select '!1'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  !1
 (1 row)
 
 select '1|2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1 | 2
 (1 row)
 
 select '1|!2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1 | !2
 (1 row)
 
 select '!1|2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  !1 | 2
 (1 row)
 
 select '!1|!2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  !1 | !2
 (1 row)
 
 select '!(!1|!2)'::query_int;
-   ?column?   
+  query_int   
 --------------
  !( !1 | !2 )
 (1 row)
 
 select '!(!1|2)'::query_int;
-  ?column?   
+  query_int  
 -------------
  !( !1 | 2 )
 (1 row)
 
 select '!(1|!2)'::query_int;
-  ?column?   
+  query_int  
 -------------
  !( 1 | !2 )
 (1 row)
 
 select '!(1|2)'::query_int;
-  ?column?  
+ query_int  
 ------------
  !( 1 | 2 )
 (1 row)
 
 select '1&2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1 & 2
 (1 row)
 
 select '!1&2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  !1 & 2
 (1 row)
 
 select '1&!2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1 & !2
 (1 row)
 
 select '!1&!2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  !1 & !2
 (1 row)
 
 select '(1&2)'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1 & 2
 (1 row)
 
 select '1&(2)'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  1 & 2
 (1 row)
 
 select '!(1)&2'::query_int;
- ?column? 
-----------
+ query_int 
+-----------
  !1 & 2
 (1 row)
 
 select '!(1&2)'::query_int;
-  ?column?  
+ query_int  
 ------------
  !( 1 & 2 )
 (1 row)
 
 select '1|2&3'::query_int;
- ?column?  
+ query_int 
 -----------
  1 | 2 & 3
 (1 row)
 
 select '1|(2&3)'::query_int;
- ?column?  
+ query_int 
 -----------
  1 | 2 & 3
 (1 row)
 
 select '(1|2)&3'::query_int;
-   ?column?    
+   query_int   
 ---------------
  ( 1 | 2 ) & 3
 (1 row)
 
 select '1|2&!3'::query_int;
-  ?column?  
+ query_int  
 ------------
  1 | 2 & !3
 (1 row)
 
 select '1|!2&3'::query_int;
-  ?column?  
+ query_int  
 ------------
  1 | !2 & 3
 (1 row)
 
 select '!1|2&3'::query_int;
-  ?column?  
+ query_int  
 ------------
  !1 | 2 & 3
 (1 row)
 
 select '!1|(2&3)'::query_int;
-  ?column?  
+ query_int  
 ------------
  !1 | 2 & 3
 (1 row)
 
 select '!(1|2)&3'::query_int;
-    ?column?    
+   query_int    
 ----------------
  !( 1 | 2 ) & 3
 (1 row)
 
 select '(!1|2)&3'::query_int;
-    ?column?    
+   query_int    
 ----------------
  ( !1 | 2 ) & 3
 (1 row)
 
 select '1|(2|(4|(5|6)))'::query_int;
-           ?column?            
+           query_int           
 -------------------------------
  1 | ( 2 | ( 4 | ( 5 | 6 ) ) )
 (1 row)
 
 select '1|2|4|5|6'::query_int;
-           ?column?            
+           query_int           
 -------------------------------
  ( ( ( 1 | 2 ) | 4 ) | 5 ) | 6
 (1 row)
 
 select '1&(2&(4&(5&6)))'::query_int;
-     ?column?      
+     query_int     
 -------------------
  1 & 2 & 4 & 5 & 6
 (1 row)
 
 select '1&2&4&5&6'::query_int;
-     ?column?      
+     query_int     
 -------------------
  1 & 2 & 4 & 5 & 6
 (1 row)
 
 select '1&(2&(4&(5|6)))'::query_int;
-       ?column?        
+       query_int       
 -----------------------
  1 & 2 & 4 & ( 5 | 6 )
 (1 row)
 
 select '1&(2&(4&(5|!6)))'::query_int;
-        ?column?        
+       query_int        
 ------------------------
  1 & 2 & 4 & ( 5 | !6 )
 (1 row)