diff --git a/contrib/btree_gist/expected/btree_gist.out b/contrib/btree_gist/expected/btree_gist.out
index 2c7cbd620e5d2ff7b31998008ca99ab406c0a7d9..ab6a789f615abe45d47d3f533e4857d20c736f00 100644
--- a/contrib/btree_gist/expected/btree_gist.out
+++ b/contrib/btree_gist/expected/btree_gist.out
@@ -3,6 +3,10 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
+psql:btree_gist.sql:10: WARNING:  ProcedureCreate: type int4key is not yet defined
+psql:btree_gist.sql:15: WARNING:  Argument type "int4key" is only a shell
+psql:btree_gist.sql:76: WARNING:  ProcedureCreate: type tskey is not yet defined
+psql:btree_gist.sql:81: WARNING:  Argument type "tskey" is only a shell
 create table inttmp (b int4);
 \copy inttmp from 'data/test_btree.data'
 create table tstmp ( t timestamp without time zone );
diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out
index ed94a25b44cbe283047a7ed9075ac67bc4d9dcd5..e69ce9f2f5f9dc65a25784569b0e0dbf3dd64682 100644
--- a/contrib/cube/expected/cube.out
+++ b/contrib/cube/expected/cube.out
@@ -6,6 +6,8 @@
 -- does not depend on contents of cube.sql.
 --
 \set ECHO none
+psql:cube.sql:11: WARNING:  ProcedureCreate: type cube is not yet defined
+psql:cube.sql:16: WARNING:  Argument type "cube" is only a shell
 --
 -- testing the input and output functions
 --
diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out
index 87298630be45a2f1a4dd490e2449d9eb6de60ba7..f860608b128a52a1394b0a3ce3d754195b31493b 100644
--- a/contrib/intarray/expected/_int.out
+++ b/contrib/intarray/expected/_int.out
@@ -3,6 +3,8 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
+psql:_int.sql:13: WARNING:  ProcedureCreate: type query_int is not yet defined
+psql:_int.sql:18: WARNING:  Argument type "query_int" is only a shell
 select intset(1234);
  intset 
 --------
diff --git a/contrib/ltree/expected/ltree.out b/contrib/ltree/expected/ltree.out
index 642e26cab2833c52496030acac46dbaf40ca305c..4af0260bed3080f632f8cf1a7b9f8c01a0b526c2 100644
--- a/contrib/ltree/expected/ltree.out
+++ b/contrib/ltree/expected/ltree.out
@@ -1,4 +1,12 @@
 \set ECHO none
+psql:ltree.sql:9: WARNING:  ProcedureCreate: type ltree is not yet defined
+psql:ltree.sql:14: WARNING:  Argument type "ltree" is only a shell
+psql:ltree.sql:238: WARNING:  ProcedureCreate: type lquery is not yet defined
+psql:ltree.sql:243: WARNING:  Argument type "lquery" is only a shell
+psql:ltree.sql:290: WARNING:  ProcedureCreate: type ltxtquery is not yet defined
+psql:ltree.sql:295: WARNING:  Argument type "ltxtquery" is only a shell
+psql:ltree.sql:345: WARNING:  ProcedureCreate: type ltree_gist is not yet defined
+psql:ltree.sql:350: WARNING:  Argument type "ltree_gist" is only a shell
 select ''::ltree;
  ltree 
 -------
diff --git a/contrib/seg/expected/seg.out b/contrib/seg/expected/seg.out
index 9abfdc2ecb84f2f6632ab694fc62674279f31942..c8e63f76e9f903a672eb2f222767b7a64dc39bd9 100644
--- a/contrib/seg/expected/seg.out
+++ b/contrib/seg/expected/seg.out
@@ -6,6 +6,8 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
+psql:seg.sql:11: WARNING:  ProcedureCreate: type seg is not yet defined
+psql:seg.sql:16: WARNING:  Argument type "seg" is only a shell
 --
 -- testing the input and output functions
 --
diff --git a/contrib/tsearch/expected/tsearch.out b/contrib/tsearch/expected/tsearch.out
index 0b12765d8f6cf0335703f54fe0c2007685867ad2..85aa9786558e99c6d068e481eaabdfbf05f9a2bf 100644
--- a/contrib/tsearch/expected/tsearch.out
+++ b/contrib/tsearch/expected/tsearch.out
@@ -3,6 +3,14 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
+psql:tsearch.sql:11: WARNING:  ProcedureCreate: type txtidx is not yet defined
+psql:tsearch.sql:16: WARNING:  Argument type "txtidx" is only a shell
+psql:tsearch.sql:40: WARNING:  ProcedureCreate: type query_txt is not yet defined
+psql:tsearch.sql:45: WARNING:  Argument type "query_txt" is only a shell
+psql:tsearch.sql:57: WARNING:  ProcedureCreate: type mquery_txt is not yet defined
+psql:tsearch.sql:63: WARNING:  Argument type "mquery_txt" is only a shell
+psql:tsearch.sql:133: WARNING:  ProcedureCreate: type gtxtidx is not yet defined
+psql:tsearch.sql:138: WARNING:  Argument type "gtxtidx" is only a shell
 --txtidx
 select '1'::txtidx;
  txtidx