Modify fmgr so that internal name (compiler name) of a built-in

function is found in prosrc field of pg_proc, not proname.  This allows
multiple aliases of a built-in to all be implemented as direct builtins,
without needing a level of indirection through an SQL function.  Replace
existing SQL alias functions with builtin entries accordingly.
Save a few K by not storing string names of builtin functions in fmgr's
internal table (if you really want 'em, get 'em from pg_proc...).
Update opr_sanity with a few more cross-checks.

diff --git a/src/backend/utils/Gen_fmgrtab.sh.in b/src/backend/utils/Gen_fmgrtab.sh.in
index 40f1dccb5dcda1fd8ad6f297e1594ffc2fe15949..24bd9fdde14685e739fe50a486fc3920a073f1b7 100644 (file)
--- a/src/backend/utils/Gen_fmgrtab.sh.in
+++ b/src/backend/utils/Gen_fmgrtab.sh.in
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.13 1999/01/25 00:44:53 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.14 1999/03/29 01:30:35 tgl Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -83,7 +83,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh.in,v 1.13 1999/01/25 00:44:53 tgl Exp $
+ * $Id: Gen_fmgrtab.sh.in,v 1.14 1999/03/29 01:30:35 tgl Exp $
  *
  * NOTES
  *     ******************************
@@ -172,10 +172,19 @@ FmgrInfo        *fmgr_pl_finfo;
 #define        SEL_CONSTANT    1       /* constant does not vary (not a parameter) */
 #define        SEL_RIGHT       2       /* constant appears to right of operator */
 
+/*
+ *     Constant macros for the OIDs of entries in pg_proc.
+ *     NOTE: if the same "proname" is used for more than one
+ *     internal-function entry in pg_proc, the equivalent macro
+ *     will be defined with the lowest OID among those entries.
+ */
 FuNkYfMgRsTuFf
-awk '{ print $2, $1; }' $RAWFILE | \
-@TR@ @TRARGS@ | \
-sed -e 's/^/#define F_/' >> $HFILE
+
+@TR@ @TRARGS@ < $RAWFILE | \
+awk '
+BEGIN  { OFS = ""; }
+       { if (seenit[$2]++ == 0) print "#define F_", $2, " ", $1; }' >> $HFILE
+
 cat >> $HFILE <<FuNkYfMgRsTuFf
 
 #endif /* FMGR_H */
@@ -197,7 +206,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.13 1999/01/25 00:44:53 tgl Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.14 1999/03/29 01:30:35 tgl Exp $
  *
  * NOTES
  *
@@ -235,12 +244,16 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
 #include "utils/fmgrtab.h"
 
 FuNkYfMgRtAbStUfF
-awk '{ print "extern char *" $2 "();"; }' $RAWFILE >> $TABCFILE
+
+awk '{ print "extern char *", $(NF-1), "();"; }' $RAWFILE >> $TABCFILE
+
 cat >> $TABCFILE <<FuNkYfMgRtAbStUfF
 
 static FmgrCall fmgr_builtins[] = {
 FuNkYfMgRtAbStUfF
-awk '{ printf ("  {%d , %d , %s, \"%s\" },\n"), $1, $8, $2, $2 }' $RAWFILE >> $TABCFILE
+
+awk '{ printf ("  {%d, %d, %s },\n"), $1, $8, $(NF-1) }' $RAWFILE >> $TABCFILE
+
 cat >> $TABCFILE <<FuNkYfMgRtAbStUfF
        /* guardian value */
 #ifndef WIN32
@@ -276,16 +289,6 @@ FmgrCall *fmgr_isbuiltin(Oid id)
        return (FmgrCall *) NULL;
 }
 
-func_ptr fmgr_lookupByName(char *name) 
-{
-    int i;
-    for (i=0; i<FMGR_NBUILTINS; i++) {
-               if (strcmp(name,fmgr_builtins[i].funcName) == 0)
-                       return(fmgr_builtins[i].func);
-    }
-    return((func_ptr) NULL);
-}
-
 FuNkYfMgRtAbStUfF
 
 rm -f $RAWFILE

diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 2e663657b6b8fd4b86aca82b83c6472941280f4c..f1cbede894c7781b859a692184f906b7041fe68c 100644 (file)
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.22 1999/02/13 23:19:52 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.23 1999/03/29 01:30:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -169,14 +169,20 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
        finfo->fn_plhandler = NULL;
        finfo->fn_oid = procedureId;
 
-       if (!(fcp = fmgr_isbuiltin(procedureId)))
+       if ((fcp = fmgr_isbuiltin(procedureId)) != NULL)
+       {
+               /* Fast path for builtin functions: don't bother consulting pg_proc */
+               finfo->fn_addr = fcp->func;
+               finfo->fn_nargs = fcp->nargs;
+       }
+       else
        {
                procedureTuple = SearchSysCacheTuple(PROOID,
-                                                                                  ObjectIdGetDatum(procedureId),
+                                                                                        ObjectIdGetDatum(procedureId),
                                                                                         0, 0, 0);
                if (!HeapTupleIsValid(procedureTuple))
                {
-                       elog(ERROR, "fmgr_info: function %d: cache lookup failed\n",
+                       elog(ERROR, "fmgr_info: function %d: cache lookup failed",
                                 procedureId);
                }
                procedureStruct = (FormData_pg_proc *) GETSTRUCT(procedureTuple);
@@ -190,11 +196,12 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
                switch (language)
                {
                        case INTERNALlanguageId:
-                               finfo->fn_addr = fmgr_lookupByName(procedureStruct->proname.data);
-                               if (!finfo->fn_addr)
-                                       elog(ERROR, "fmgr_info: function %s: not in internal table",
-                                                procedureStruct->proname.data);
-                               finfo->fn_nargs = procedureStruct->pronargs;
+                               /*
+                                * Since we already tried to look up the OID as a builtin
+                                * function, we should never get here...
+                                */
+                               elog(ERROR, "fmgr_info: function %d: not in internal table",
+                                        procedureId);
                                break;
                        case ClanguageId:
                                finfo->fn_addr = fmgr_dynamic(procedureId, &(finfo->fn_nargs));
@@ -239,11 +246,6 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
                                break;
                }
        }
-       else
-       {
-               finfo->fn_addr = fcp->func;
-               finfo->fn_nargs = fcp->nargs;
-       }
 }
 
 /*

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index da0e4ca7ab6b87eac62fc5ed968247ef76ad001b..2925d6cdb9df06d107dd0b5bf533ada18f4e851e 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.93 1999/03/28 02:01:39 tgl Exp $
+ * $Id: pg_proc.h,v 1.94 1999/03/29 01:30:37 tgl Exp $
  *
  * NOTES
  *       The script catalog/genbki.sh reads this file and generates .bki
@@ -94,1581 +94,1579 @@ typedef FormData_pg_proc *Form_pg_proc;
 
 /* OIDS 1 - 99 */
 
-DATA(insert OID = 1242 (  boolin                  PGUID 11 f t f 1 f 16 "0" 100 0 0  100  foo bar ));
+DATA(insert OID = 1242 (  boolin                  PGUID 11 f t f 1 f 16 "0" 100 0 0  100  boolin - ));
 DESCR("(internal)");
-DATA(insert OID = 1243 (  boolout                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1243 (  boolout                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  boolout - ));
 DESCR("(internal)");
-DATA(insert OID = 1244 (  byteain                 PGUID 11 f t f 1 f 17 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1244 (  byteain                 PGUID 11 f t f 1 f 17 "0" 100 0 0 100  byteain - ));
 DESCR("(internal)");
-DATA(insert OID =  31 (  byteaout                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  31 (  byteaout                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  byteaout - ));
 DESCR("(internal)");
-DATA(insert OID = 1245 (  charin                  PGUID 11 f t f 1 f 18 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1245 (  charin                  PGUID 11 f t f 1 f 18 "0" 100 0 0 100  charin - ));
 DESCR("(internal)");
-DATA(insert OID =  33 (  charout                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  33 (  charout                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  charout - ));
 DESCR("(internal)");
-DATA(insert OID =  34 (  namein                           PGUID 11 f t f 1 f 19 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  34 (  namein                           PGUID 11 f t f 1 f 19 "0" 100 0 0 100  namein - ));
 DESCR("(internal)");
-DATA(insert OID =  35 (  nameout                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  35 (  nameout                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  nameout - ));
 DESCR("(internal)");
-DATA(insert OID =  38 (  int2in                           PGUID 11 f t f 1 f 21 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  38 (  int2in                           PGUID 11 f t f 1 f 21 "0" 100 0 0 100  int2in - ));
 DESCR("(internal)");
-DATA(insert OID =  39 (  int2out                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  39 (  int2out                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  int2out - ));
 DESCR("(internal)");
-DATA(insert OID =  40 (  int28in                  PGUID 11 f t f 1 f 22 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  40 (  int28in                  PGUID 11 f t f 1 f 22 "0" 100 0 0 100  int28in - ));
 DESCR("(internal)");
-DATA(insert OID =  41 (  int28out                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  41 (  int28out                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  int28out - ));
 DESCR("(internal)");
-DATA(insert OID =  42 (  int4in                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  42 (  int4in                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  int4in - ));
 DESCR("(internal)");
-DATA(insert OID =  43 (  int4out                  PGUID 11 f t f 1 f 19 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  43 (  int4out                  PGUID 11 f t f 1 f 19 "0" 100 0 0 100  int4out - ));
 DESCR("(internal)");
-DATA(insert OID =  44 (  regprocin                PGUID 11 f t f 1 f 24 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  44 (  regprocin                PGUID 11 f t f 1 f 24 "0" 100 0 0 100  regprocin - ));
 DESCR("(internal)");
-DATA(insert OID =  45 (  regprocout               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  45 (  regprocout               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  regprocout - ));
 DESCR("(internal)");
-DATA(insert OID =  46 (  textin                           PGUID 11 f t f 1 f 25 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  46 (  textin                           PGUID 11 f t f 1 f 25 "0" 100 0 0 100  textin - ));
 DESCR("(internal)");
-DATA(insert OID =  47 (  textout                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  47 (  textout                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  textout - ));
 DESCR("(internal)");
-DATA(insert OID =  48 (  tidin                    PGUID 11 f t f 1 f 27 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  48 (  tidin                    PGUID 11 f t f 1 f 27 "0" 100 0 0 100  tidin - ));
 DESCR("(internal)");
-DATA(insert OID =  49 (  tidout                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  49 (  tidout                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  tidout - ));
 DESCR("(internal)");
-DATA(insert OID =  50 (  xidin                    PGUID 11 f t f 1 f 28 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  50 (  xidin                    PGUID 11 f t f 1 f 28 "0" 100 0 0 100  xidin - ));
 DESCR("(internal)");
-DATA(insert OID =  51 (  xidout                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  51 (  xidout                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  xidout - ));
 DESCR("(internal)");
-DATA(insert OID =  52 (  cidin                    PGUID 11 f t f 1 f 29 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  52 (  cidin                    PGUID 11 f t f 1 f 29 "0" 100 0 0 100  cidin - ));
 DESCR("(internal)");
-DATA(insert OID =  53 (  cidout                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  53 (  cidout                           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  cidout - ));
 DESCR("(internal)");
-DATA(insert OID =  54 (  oid8in                           PGUID 11 f t f 1 f 30 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  54 (  oid8in                           PGUID 11 f t f 1 f 30 "0" 100 0 0 100  oid8in - ));
 DESCR("(internal)");
-DATA(insert OID =  55 (  oid8out                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  55 (  oid8out                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  oid8out - ));
 DESCR("(internal)");
-DATA(insert OID =  56 (  boollt                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  foo bar ));
+DATA(insert OID =  56 (  boollt                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  boollt - ));
 DESCR("less-than");
-DATA(insert OID =  57 (  boolgt                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  foo bar ));
+DATA(insert OID =  57 (  boolgt                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  boolgt - ));
 DESCR("greater-than");
-DATA(insert OID =  60 (  booleq                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  foo bar ));
+DATA(insert OID =  60 (  booleq                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  booleq - ));
 DESCR("equal");
-DATA(insert OID =  61 (  chareq                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  61 (  chareq                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  chareq - ));
 DESCR("equal");
-DATA(insert OID =  62 (  nameeq                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  foo bar ));
+DATA(insert OID =  62 (  nameeq                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  nameeq - ));
 DESCR("equal");
-DATA(insert OID =  63 (  int2eq                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID =  63 (  int2eq                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  int2eq - ));
 DESCR("equal");
-DATA(insert OID =  64 (  int2lt                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID =  64 (  int2lt                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  int2lt - ));
 DESCR("less-than");
-DATA(insert OID =  65 (  int4eq                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID =  65 (  int4eq                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  int4eq - ));
 DESCR("equal");
-DATA(insert OID =  66 (  int4lt                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID =  66 (  int4lt                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  int4lt - ));
 DESCR("less-than");
-DATA(insert OID =  67 (  texteq                           PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      foo bar ));
+DATA(insert OID =  67 (  texteq                           PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      texteq - ));
 DESCR("equal");
-DATA(insert OID =  68 (  xideq                    PGUID 11 f t f 2 f 16 "28 28" 100 0 0 100  foo bar ));
+DATA(insert OID =  68 (  xideq                    PGUID 11 f t f 2 f 16 "28 28" 100 0 0 100  xideq - ));
 DESCR("equal");
-DATA(insert OID =  69 (  cideq                    PGUID 11 f t f 2 f 16 "29 29" 100 0 0 100  foo bar ));
+DATA(insert OID =  69 (  cideq                    PGUID 11 f t f 2 f 16 "29 29" 100 0 0 100  cideq - ));
 DESCR("equal");
-DATA(insert OID =  70 (  charne                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  70 (  charne                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  charne - ));
 DESCR("not equal");
-DATA(insert OID = 1246 (  charlt                  PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID = 1246 (  charlt                  PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  charlt - ));
 DESCR("less-than");
-DATA(insert OID =  72 (  charle                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  72 (  charle                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  charle - ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  73 (  chargt                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  73 (  chargt                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  chargt - ));
 DESCR("greater-than");
-DATA(insert OID =  74 (  charge                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  74 (  charge                           PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  charge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1248 (  charpl                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID = 1248 (  charpl                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  charpl - ));
 DESCR("addition");
-DATA(insert OID = 1250 (  charmi                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID = 1250 (  charmi                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  charmi - ));
 DESCR("subtract");
-DATA(insert OID =  77 (  charmul                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  77 (  charmul                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  charmul - ));
 DESCR("multiply");
-DATA(insert OID =  78 (  chardiv                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  78 (  chardiv                  PGUID 11 f t f 2 f 18 "18 18" 100 0 0 100  chardiv - ));
 DESCR("divide");
 
-DATA(insert OID =  79 (  nameregexeq      PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  79 (  nameregexeq      PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  nameregexeq - ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1252 (  nameregexne     PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
+DATA(insert OID = 1252 (  nameregexne     PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  nameregexne - ));
 DESCR("does not match regex., case-sensitive");
-DATA(insert OID = 1254 (  textregexeq     PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0      foo bar ));
+DATA(insert OID = 1254 (  textregexeq     PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0      textregexeq - ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1256 (  textregexne     PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0      foo bar ));
+DATA(insert OID = 1256 (  textregexne     PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0      textregexne - ));
 DESCR("does not match regex., case-sensitive");
-DATA(insert OID = 1257 (  textlen                 PGUID 11 f t f 1 f 23 "25" 100 0 1 0  foo bar ));
+DATA(insert OID = 1257 (  textlen                 PGUID 11 f t f 1 f 23 "25" 100 0 1 0  textlen - ));
 DESCR("length");
-DATA(insert OID = 1258 (  textcat                 PGUID 11 f t f 2 f 25 "25 25" 100 0 1 0      foo bar ));
+DATA(insert OID = 1258 (  textcat                 PGUID 11 f t f 2 f 25 "25 25" 100 0 1 0      textcat - ));
 DESCR("concatenate");
-DATA(insert OID = 1377 (  textoctetlen    PGUID 11 f t f 1 f 23 "25" 100 0 1 0  foo bar ));
+DATA(insert OID = 1377 (  textoctetlen    PGUID 11 f t f 1 f 23 "25" 100 0 1 0  textoctetlen - ));
 DESCR("octet length");
 
-DATA(insert OID =  84 (  boolne                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  foo bar ));
+DATA(insert OID =  84 (  boolne                           PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100  boolne - ));
 DESCR("not equal");
-DATA(insert OID =  89 (  version                  PGUID 11 f t t 0 f 25 "" 100 0 0 100 foo bar ));
+DATA(insert OID =  89 (  version                  PGUID 11 f t t 0 f 25 "" 100 0 0 100 version - ));
 DESCR("PostgreSQL version string");
 
-DATA(insert OID = 1265 (  rtsel                           PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 1265 (  rtsel                           PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  rtsel - ));
 DESCR("r-tree");
-DATA(insert OID = 1266 (  rtnpage                 PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 1266 (  rtnpage                 PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  rtnpage - ));
 DESCR("r-tree");
-DATA(insert OID = 1268 (  btreesel                PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 1268 (  btreesel                PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  btreesel - ));
 DESCR("btree selectivity");
 
 /* OIDS 100 - 199 */
 
-DATA(insert OID = 1270 (  btreenpage      PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 1270 (  btreenpage      PGUID 11 f t f 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  btreenpage - ));
 DESCR("btree");
-DATA(insert OID = 1272 (  eqsel                           PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1272 (  eqsel                           PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  eqsel - ));
 DESCR("general selectivity");
-DATA(insert OID = 102 (  neqsel                           PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 102 (  neqsel                           PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  neqsel - ));
 DESCR("not-equal selectivity");
-DATA(insert OID = 103 (  intltsel                 PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 103 (  intltsel                 PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  intltsel - ));
 DESCR("selectivity");
-DATA(insert OID = 104 (  intgtsel                 PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 104 (  intgtsel                 PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  intgtsel - ));
 DESCR("selectivity");
-DATA(insert OID = 105 (  eqjoinsel                PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 105 (  eqjoinsel                PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  eqjoinsel - ));
 DESCR("selectivity");
-DATA(insert OID = 106 (  neqjoinsel               PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 106 (  neqjoinsel               PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  neqjoinsel - ));
 DESCR("selectivity");
-DATA(insert OID = 107 (  intltjoinsel     PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 107 (  intltjoinsel     PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  intltjoinsel - ));
 DESCR("selectivity");
-DATA(insert OID = 108 (  intgtjoinsel     PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 108 (  intgtjoinsel     PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  intgtjoinsel - ));
 DESCR("selectivity");
 
-DATA(insert OID = 112 (  int4_text                PGUID 11 f t f 1 f  25 "23" 100 0 0 100      foo bar ));
+DATA(insert OID = 112 (  int4_text                PGUID 11 f t f 1 f  25 "23" 100 0 0 100      int4_text - ));
 DESCR("convert int4 to text");
-DATA(insert OID = 113 (  int2_text                PGUID 11 f t f 1 f  25 "21" 100 0 0 100      foo bar ));
+DATA(insert OID = 113 (  int2_text                PGUID 11 f t f 1 f  25 "21" 100 0 0 100      int2_text - ));
 DESCR("convert int2 to text");
-DATA(insert OID = 114 (  oid_text                 PGUID 11 f t f 1 f  25 "26" 100 0 0 100      foo bar ));
+DATA(insert OID = 114 (  oid_text                 PGUID 11 f t f 1 f  25 "26" 100 0 0 100      oid_text - ));
 DESCR("convert oid to text");
 
-DATA(insert OID = 115 (  box_above                PGUID 11 f t f 2 f  16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 115 (  box_above                PGUID 11 f t f 2 f  16 "603 603" 100 1 0 100  box_above - ));
 DESCR("is above");
-DATA(insert OID = 116 (  box_below                PGUID 11 f t f 2 f  16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 116 (  box_below                PGUID 11 f t f 2 f  16 "603 603" 100 1 0 100  box_below - ));
 DESCR("is below");
 
-DATA(insert OID = 117 (  point_in                 PGUID 11 f t f 1 f 600 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 117 (  point_in                 PGUID 11 f t f 1 f 600 "0" 100 0 0 100  point_in - ));
 DESCR("(internal)");
-DATA(insert OID = 118 (  point_out                PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 118 (  point_out                PGUID 11 f t f 1 f 23  "0" 100 0 0 100  point_out - ));
 DESCR("(internal)");
-DATA(insert OID = 119 (  lseg_in                  PGUID 11 f t f 1 f 601 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 119 (  lseg_in                  PGUID 11 f t f 1 f 601 "0" 100 0 0 100  lseg_in - ));
 DESCR("(internal)");
-DATA(insert OID = 120 (  lseg_out                 PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 120 (  lseg_out                 PGUID 11 f t f 1 f 23  "0" 100 0 0 100  lseg_out - ));
 DESCR("(internal)");
-DATA(insert OID = 121 (  path_in                  PGUID 11 f t f 1 f 602 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 121 (  path_in                  PGUID 11 f t f 1 f 602 "0" 100 0 0 100  path_in - ));
 DESCR("(internal)");
-DATA(insert OID = 122 (  path_out                 PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 122 (  path_out                 PGUID 11 f t f 1 f 23  "0" 100 0 0 100  path_out - ));
 DESCR("(internal)");
-DATA(insert OID = 123 (  box_in                           PGUID 11 f t f 1 f 603 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 123 (  box_in                           PGUID 11 f t f 1 f 603 "0" 100 0 0 100  box_in - ));
 DESCR("(internal)");
-DATA(insert OID = 124 (  box_out                  PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 124 (  box_out                  PGUID 11 f t f 1 f 23  "0" 100 0 0 100  box_out - ));
 DESCR("(internal)");
-DATA(insert OID = 125 (  box_overlap      PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 125 (  box_overlap      PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  box_overlap - ));
 DESCR("overlaps");
-DATA(insert OID = 126 (  box_ge                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 126 (  box_ge                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  box_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 127 (  box_gt                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 127 (  box_gt                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  box_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 128 (  box_eq                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 128 (  box_eq                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  box_eq - ));
 DESCR("equal");
-DATA(insert OID = 129 (  box_lt                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 129 (  box_lt                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  box_lt - ));
 DESCR("less-than");
-DATA(insert OID = 130 (  box_le                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  foo bar ));
+DATA(insert OID = 130 (  box_le                           PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100  box_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 131 (  point_above      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 131 (  point_above      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_above - ));
 DESCR("is above");
-DATA(insert OID = 132 (  point_left               PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 132 (  point_left               PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_left - ));
 DESCR("is left of");
-DATA(insert OID = 133 (  point_right      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 133 (  point_right      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_right - ));
 DESCR("is left of");
-DATA(insert OID = 134 (  point_below      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 134 (  point_below      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_below - ));
 DESCR("is below");
-DATA(insert OID = 135 (  point_eq                 PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 135 (  point_eq                 PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_eq - ));
 DESCR("same as");
-DATA(insert OID = 136 (  on_pb                    PGUID 11 f t f 2 f 16 "600 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 136 (  on_pb                    PGUID 11 f t f 2 f 16 "600 603" 100 0 0 100  on_pb - ));
 DESCR("point is inside");
-DATA(insert OID = 137 (  on_ppath                 PGUID 11 f t f 2 f 16 "600 602" 100 0 1 0  foo bar ));
+DATA(insert OID = 137 (  on_ppath                 PGUID 11 f t f 2 f 16 "600 602" 100 0 1 0  on_ppath - ));
 DESCR("contained in");
-DATA(insert OID = 138 (  box_center               PGUID 11 f t f 1 f 600 "603" 100 1 0 100  foo bar ));
+DATA(insert OID = 138 (  box_center               PGUID 11 f t f 1 f 600 "603" 100 1 0 100  box_center - ));
 DESCR("center of");
-DATA(insert OID = 139 (  areasel                  PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 139 (  areasel                  PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  areasel - ));
 DESCR("selectivity");
-DATA(insert OID = 140 (  areajoinsel      PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 140 (  areajoinsel      PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100  areajoinsel - ));
 DESCR("selectivity");
-DATA(insert OID = 141 (  int4mul                  PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 141 (  int4mul                  PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  int4mul - ));
 DESCR("multiply");
-DATA(insert OID = 142 (  int4fac                  PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 142 (  int4fac                  PGUID 11 f t f 1 f 23 "23" 100 0 0 100  int4fac - ));
 DESCR("fraction");
-DATA(insert OID = 143 (  pointdist                PGUID 11 f t f 2 f 23 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 143 (  pointdist                PGUID 11 f t f 2 f 23 "600 600" 100 0 0 100  pointdist - ));
 DESCR("");
-DATA(insert OID = 144 (  int4ne                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 144 (  int4ne                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  int4ne - ));
 DESCR("not equal");
-DATA(insert OID = 145 (  int2ne                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 145 (  int2ne                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  int2ne - ));
 DESCR("not equal");
-DATA(insert OID = 146 (  int2gt                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 146 (  int2gt                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  int2gt - ));
 DESCR("greater-than");
-DATA(insert OID = 147 (  int4gt                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 147 (  int4gt                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  int4gt - ));
 DESCR("greater-than");
-DATA(insert OID = 148 (  int2le                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 148 (  int2le                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  int2le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 149 (  int4le                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 149 (  int4le                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  int4le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 150 (  int4ge                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 150 (  int4ge                           PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  int4ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 151 (  int2ge                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 151 (  int2ge                           PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  int2ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 152 (  int2mul                  PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 152 (  int2mul                  PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  int2mul - ));
 DESCR("multiply");
-DATA(insert OID = 153 (  int2div                  PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 153 (  int2div                  PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  int2div - ));
 DESCR("divide");
-DATA(insert OID = 154 (  int4div                  PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 154 (  int4div                  PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  int4div - ));
 DESCR("divide");
-DATA(insert OID = 155 (  int2mod                  PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 155 (  int2mod                  PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  int2mod - ));
 DESCR("modulus");
-DATA(insert OID = 156 (  int4mod                  PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 156 (  int4mod                  PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  int4mod - ));
 DESCR("modulus");
-DATA(insert OID = 157 (  textne                           PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      foo bar ));
+DATA(insert OID = 157 (  textne                           PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      textne - ));
 DESCR("not equal");
-DATA(insert OID = 158 (  int24eq                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 158 (  int24eq                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  int24eq - ));
 DESCR("equal");
-DATA(insert OID = 159 (  int42eq                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 159 (  int42eq                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  int42eq - ));
 DESCR("equal");
-DATA(insert OID = 160 (  int24lt                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 160 (  int24lt                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  int24lt - ));
 DESCR("less-than");
-DATA(insert OID = 161 (  int42lt                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 161 (  int42lt                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  int42lt - ));
 DESCR("less-than");
-DATA(insert OID = 162 (  int24gt                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 162 (  int24gt                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  int24gt - ));
 DESCR("greater-than");
-DATA(insert OID = 163 (  int42gt                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 163 (  int42gt                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  int42gt - ));
 DESCR("greater-than");
-DATA(insert OID = 164 (  int24ne                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 164 (  int24ne                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  int24ne - ));
 DESCR("not equal");
-DATA(insert OID = 165 (  int42ne                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 165 (  int42ne                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  int42ne - ));
 DESCR("not equal");
-DATA(insert OID = 166 (  int24le                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 166 (  int24le                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  int24le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 167 (  int42le                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 167 (  int42le                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  int42le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 168 (  int24ge                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 168 (  int24ge                  PGUID 11 f t f 2 f 16 "21 23" 100 0 0 100  int24ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 169 (  int42ge                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 169 (  int42ge                  PGUID 11 f t f 2 f 16 "23 21" 100 0 0 100  int42ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 170 (  int24mul                 PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 170 (  int24mul                 PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  int24mul - ));
 DESCR("multiply");
-DATA(insert OID = 171 (  int42mul                 PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 171 (  int42mul                 PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  int42mul - ));
 DESCR("multiply");
-DATA(insert OID = 172 (  int24div                 PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 172 (  int24div                 PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  int24div - ));
 DESCR("divide");
-DATA(insert OID = 173 (  int42div                 PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 173 (  int42div                 PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  int42div - ));
 DESCR("divide");
-DATA(insert OID = 174 (  int24mod                 PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 174 (  int24mod                 PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  int24mod - ));
 DESCR("modulus");
-DATA(insert OID = 175 (  int42mod                 PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 175 (  int42mod                 PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  int42mod - ));
 DESCR("modulus");
-DATA(insert OID = 176 (  int2pl                           PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 176 (  int2pl                           PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  int2pl - ));
 DESCR("addition");
-DATA(insert OID = 177 (  int4pl                           PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 177 (  int4pl                           PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  int4pl - ));
 DESCR("addition");
-DATA(insert OID = 178 (  int24pl                  PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 178 (  int24pl                  PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  int24pl - ));
 DESCR("addition");
-DATA(insert OID = 179 (  int42pl                  PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 179 (  int42pl                  PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  int42pl - ));
 DESCR("addition");
-DATA(insert OID = 180 (  int2mi                           PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 180 (  int2mi                           PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  int2mi - ));
 DESCR("subtract");
-DATA(insert OID = 181 (  int4mi                           PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 181 (  int4mi                           PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  int4mi - ));
 DESCR("subtract");
-DATA(insert OID = 182 (  int24mi                  PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 182 (  int24mi                  PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  int24mi - ));
 DESCR("subtract");
-DATA(insert OID = 183 (  int42mi                  PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 183 (  int42mi                  PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  int42mi - ));
 DESCR("subtract");
-DATA(insert OID = 184 (  oideq                    PGUID 11 f t f 2 f 16 "26 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 184 (  oideq                    PGUID 11 f t f 2 f 16 "26 26" 100 0 0 100  oideq - ));
 DESCR("equal");
-DATA(insert OID = 185 (  oidne                    PGUID 11 f t f 2 f 16 "26 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 185 (  oidne                    PGUID 11 f t f 2 f 16 "26 26" 100 0 0 100  oidne - ));
 DESCR("not equal");
-DATA(insert OID = 186 (  box_same                 PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 186 (  box_same                 PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  box_same - ));
 DESCR("same as");
-DATA(insert OID = 187 (  box_contain      PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 187 (  box_contain      PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  box_contain - ));
 DESCR("contains");
-DATA(insert OID = 188 (  box_left                 PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 188 (  box_left                 PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  box_left - ));
 DESCR("is left of");
-DATA(insert OID = 189 (  box_overleft     PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 189 (  box_overleft     PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  box_overleft - ));
 DESCR("overlaps, but does not extend to right of");
-DATA(insert OID = 190 (  box_overright    PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 190 (  box_overright    PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  box_overright - ));
 DESCR("overlaps, but does not extend to left of");
-DATA(insert OID = 191 (  box_right                PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 191 (  box_right                PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  box_right - ));
 DESCR("is left of");
-DATA(insert OID = 192 (  box_contained    PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 192 (  box_contained    PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100  box_contained - ));
 DESCR("contained in");
-DATA(insert OID = 193 (  rt_box_union     PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 193 (  rt_box_union     PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100  rt_box_union - ));
 DESCR("r-tree");
-DATA(insert OID = 194 (  rt_box_inter     PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 194 (  rt_box_inter     PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100  rt_box_inter - ));
 DESCR("r-tree");
-DATA(insert OID = 195 (  rt_box_size      PGUID 11 f t f 2 f 700 "603 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 195 (  rt_box_size      PGUID 11 f t f 2 f 700 "603 700" 100 0 0 100  rt_box_size - ));
 DESCR("r-tree");
-DATA(insert OID = 196 (  rt_bigbox_size    PGUID 11 f t f 2 f 700 "603 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 196 (  rt_bigbox_size    PGUID 11 f t f 2 f 700 "603 700" 100 0 0 100  rt_bigbox_size - ));
 DESCR("r-tree");
-DATA(insert OID = 197 (  rt_poly_union    PGUID 11 f t f 2 f 604 "604 604" 100 0 0 100  foo bar ));
+DATA(insert OID = 197 (  rt_poly_union    PGUID 11 f t f 2 f 604 "604 604" 100 0 0 100  rt_poly_union - ));
 DESCR("r-tree");
-DATA(insert OID = 198 (  rt_poly_inter    PGUID 11 f t f 2 f 604 "604 604" 100 0 0 100  foo bar ));
+DATA(insert OID = 198 (  rt_poly_inter    PGUID 11 f t f 2 f 604 "604 604" 100 0 0 100  rt_poly_inter - ));
 DESCR("r-tree");
-DATA(insert OID = 199 (  rt_poly_size     PGUID 11 f t f 2 f 23 "604 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 199 (  rt_poly_size     PGUID 11 f t f 2 f 23 "604 23" 100 0 0 100  rt_poly_size - ));
 DESCR("r-tree");
 
 /* OIDS 200 - 299 */
 
-DATA(insert OID = 200 (  float4in                 PGUID 11 f t f 1 f 700 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 200 (  float4in                 PGUID 11 f t f 1 f 700 "0" 100 0 0 100  float4in - ));
 DESCR("(internal)");
-DATA(insert OID = 201 (  float4out                PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 201 (  float4out                PGUID 11 f t f 1 f 23  "0" 100 0 0 100  float4out - ));
 DESCR("(internal)");
-DATA(insert OID = 202 (  float4mul                PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 202 (  float4mul                PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  float4mul - ));
 DESCR("multiply");
-DATA(insert OID = 203 (  float4div                PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 203 (  float4div                PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  float4div - ));
 DESCR("divide");
-DATA(insert OID = 204 (  float4pl                 PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 204 (  float4pl                 PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  float4pl - ));
 DESCR("addition");
-DATA(insert OID = 205 (  float4mi                 PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 205 (  float4mi                 PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  float4mi - ));
 DESCR("subtract");
-DATA(insert OID = 206 (  float4um                 PGUID 11 f t f 1 f 700 "700" 100 0 0 100  foo bar ));
+DATA(insert OID = 206 (  float4um                 PGUID 11 f t f 1 f 700 "700" 100 0 0 100  float4um - ));
 DESCR("subtract");
-DATA(insert OID = 207 (  float4abs                PGUID 11 f t f 1 f 700 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 207 (  float4abs                PGUID 11 f t f 1 f 700 "700 700" 100 0 0 100  float4abs - ));
 DESCR("absolute value");
-DATA(insert OID = 208 (  float4inc                PGUID 11 f t f 1 f 700 "700" 100 0 0 100  foo bar ));
+DATA(insert OID = 208 (  float4inc                PGUID 11 f t f 1 f 700 "700" 100 0 0 100  float4inc - ));
 DESCR("increment");
-DATA(insert OID = 209 (  float4larger     PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 209 (  float4larger     PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  float4larger - ));
 DESCR("larger of two");
-DATA(insert OID = 211 (  float4smaller    PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 211 (  float4smaller    PGUID 11 f t f 2 f 700 "700 700" 100 0 0 100  float4smaller - ));
 DESCR("smaller of two");
 
-DATA(insert OID = 212 (  int4um                           PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 212 (  int4um                           PGUID 11 f t f 1 f 23 "23" 100 0 0 100  int4um - ));
 DESCR("subtract");
-DATA(insert OID = 213 (  int2um                           PGUID 11 f t f 1 f 21 "21" 100 0 0 100  foo bar ));
+DATA(insert OID = 213 (  int2um                           PGUID 11 f t f 1 f 21 "21" 100 0 0 100  int2um - ));
 DESCR("subtract");
 
-DATA(insert OID = 214 (  float8in                 PGUID 11 f t f 1 f 701 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 214 (  float8in                 PGUID 11 f t f 1 f 701 "0" 100 0 0 100  float8in - ));
 DESCR("(internal)");
-DATA(insert OID = 215 (  float8out                PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 215 (  float8out                PGUID 11 f t f 1 f 23  "0" 100 0 0 100  float8out - ));
 DESCR("(internal)");
-DATA(insert OID = 216 (  float8mul                PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 216 (  float8mul                PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  float8mul - ));
 DESCR("multiply");
-DATA(insert OID = 217 (  float8div                PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 217 (  float8div                PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  float8div - ));
 DESCR("divide");
-DATA(insert OID = 218 (  float8pl                 PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 218 (  float8pl                 PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  float8pl - ));
 DESCR("addition");
-DATA(insert OID = 219 (  float8mi                 PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 219 (  float8mi                 PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  float8mi - ));
 DESCR("subtract");
-DATA(insert OID = 220 (  float8um                 PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 220 (  float8um                 PGUID 11 f t f 1 f 701 "701" 100 0 0 100  float8um - ));
 DESCR("subtract");
-DATA(insert OID = 221 (  float8abs                PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 221 (  float8abs                PGUID 11 f t f 1 f 701 "701" 100 0 0 100  float8abs - ));
 DESCR("absolute value");
-DATA(insert OID = 222 (  float8inc                PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 222 (  float8inc                PGUID 11 f t f 1 f 701 "701" 100 0 0 100  float8inc - ));
 DESCR("increment");
-DATA(insert OID = 223 (  float8larger     PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 223 (  float8larger     PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  float8larger - ));
 DESCR("larger of two");
-DATA(insert OID = 224 (  float8smaller    PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 224 (  float8smaller    PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  float8smaller - ));
 DESCR("smaller of two");
 
-DATA(insert OID = 225 (  lseg_center      PGUID 11 f t f 1 f 600 "601" 100 0 0 100  foo bar ));
+DATA(insert OID = 225 (  lseg_center      PGUID 11 f t f 1 f 600 "601" 100 0 0 100  lseg_center - ));
 DESCR("center of");
-DATA(insert OID = 226 (  path_center      PGUID 11 f t f 1 f 600 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 226 (  path_center      PGUID 11 f t f 1 f 600 "602" 100 0 0 100  path_center - ));
 DESCR("center of");
-DATA(insert OID = 227 (  poly_center      PGUID 11 f t f 1 f 600 "604" 100 0 0 100  foo bar ));
+DATA(insert OID = 227 (  poly_center      PGUID 11 f t f 1 f 600 "604" 100 0 0 100  poly_center - ));
 DESCR("center of");
 
-DATA(insert OID = 228 (  dround                           PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 228 (  dround                           PGUID 11 f t f 1 f 701 "701" 100 0 0 100  dround - ));
 DESCR("truncate to integer");
-DATA(insert OID = 229 (  dtrunc                           PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 229 (  dtrunc                           PGUID 11 f t f 1 f 701 "701" 100 0 0 100  dtrunc - ));
 DESCR("truncate to integer");
-DATA(insert OID = 230 (  dsqrt                    PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 230 (  dsqrt                    PGUID 11 f t f 1 f 701 "701" 100 0 0 100  dsqrt - ));
 DESCR("square root");
-DATA(insert OID = 231 (  dcbrt                    PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 231 (  dcbrt                    PGUID 11 f t f 1 f 701 "701" 100 0 0 100  dcbrt - ));
 DESCR("cube root");
-DATA(insert OID = 232 (  dpow                     PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 232 (  dpow                     PGUID 11 f t f 2 f 701 "701 701" 100 0 0 100  dpow - ));
 DESCR("exponentiation");
-DATA(insert OID = 233 (  dexp                     PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 233 (  dexp                     PGUID 11 f t f 1 f 701 "701" 100 0 0 100  dexp - ));
 DESCR("exponential");
-DATA(insert OID = 234 (  dlog1                    PGUID 11 f t f 1 f 701 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 234 (  dlog1                    PGUID 11 f t f 1 f 701 "701" 100 0 0 100  dlog1 - ));
 DESCR("natural logarithm (in psql, protect with ()");
 
-DATA(insert OID = 235 (  i2tod                    PGUID 11 f t f 1 f 701  "21" 100 0 0 100  foo bar ));
+DATA(insert OID = 235 (  i2tod                    PGUID 11 f t f 1 f 701  "21" 100 0 0 100  i2tod - ));
 DESCR("convert int2 to float8");
-DATA(insert OID = 236 (  i2tof                    PGUID 11 f t f 1 f 700  "21" 100 0 0 100  foo bar ));
+DATA(insert OID = 236 (  i2tof                    PGUID 11 f t f 1 f 700  "21" 100 0 0 100  i2tof - ));
 DESCR("convert int2 to float4");
-DATA(insert OID = 237 (  dtoi2                    PGUID 11 f t f 1 f  21 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 237 (  dtoi2                    PGUID 11 f t f 1 f  21 "701" 100 0 0 100  dtoi2 - ));
 DESCR("convert float8 to int2");
-DATA(insert OID = 238 (  ftoi2                    PGUID 11 f t f 1 f  21 "700" 100 0 0 100  foo bar ));
+DATA(insert OID = 238 (  ftoi2                    PGUID 11 f t f 1 f  21 "700" 100 0 0 100  ftoi2 - ));
 DESCR("convert float4 to int2");
-DATA(insert OID = 239 (  line_distance    PGUID 11 f t f 2 f 701 "628 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 239 (  line_distance    PGUID 11 f t f 2 f 701 "628 628" 100 0 0 100  line_distance - ));
 DESCR("distance between");
 
-DATA(insert OID = 240 (  nabstimein               PGUID 11 f t f 1 f 702 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 240 (  nabstimein               PGUID 11 f t f 1 f 702 "0" 100 0 0 100  nabstimein - ));
 DESCR("(internal)");
-DATA(insert OID = 241 (  nabstimeout      PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 241 (  nabstimeout      PGUID 11 f t f 1 f 23  "0" 100 0 0 100  nabstimeout - ));
 DESCR("(internal)");
-DATA(insert OID = 242 (  reltimein                PGUID 11 f t f 1 f 703 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 242 (  reltimein                PGUID 11 f t f 1 f 703 "0" 100 0 0 100  reltimein - ));
 DESCR("(internal)");
-DATA(insert OID = 243 (  reltimeout               PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 243 (  reltimeout               PGUID 11 f t f 1 f 23  "0" 100 0 0 100  reltimeout - ));
 DESCR("(internal)");
-DATA(insert OID = 244 (  timepl                           PGUID 11 f t f 2 f 702 "702 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 244 (  timepl                           PGUID 11 f t f 2 f 702 "702 703" 100 0 0 100  timepl - ));
 DESCR("addition");
-DATA(insert OID = 245 (  timemi                           PGUID 11 f t f 2 f 702 "702 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 245 (  timemi                           PGUID 11 f t f 2 f 702 "702 703" 100 0 0 100  timemi - ));
 DESCR("subtract");
-DATA(insert OID = 246 (  tintervalin      PGUID 11 f t f 1 f 704 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 246 (  tintervalin      PGUID 11 f t f 1 f 704 "0" 100 0 0 100  tintervalin - ));
 DESCR("(internal)");
-DATA(insert OID = 247 (  tintervalout     PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 247 (  tintervalout     PGUID 11 f t f 1 f 23  "0" 100 0 0 100  tintervalout - ));
 DESCR("(internal)");
-DATA(insert OID = 248 (  ininterval               PGUID 11 f t f 2 f 16 "702 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 248 (  ininterval               PGUID 11 f t f 2 f 16 "702 704" 100 0 0 100  ininterval - ));
 DESCR("abstime in tinterval");
-DATA(insert OID = 249 (  intervalrel      PGUID 11 f t f 1 f 703 "704" 100 0 0 100  foo bar ));
+DATA(insert OID = 249 (  intervalrel      PGUID 11 f t f 1 f 703 "704" 100 0 0 100  intervalrel - ));
 DESCR("");
-DATA(insert OID = 250 (  timenow                  PGUID 11 f t f 0 f 702 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 250 (  timenow                  PGUID 11 f t f 0 f 702 "0" 100 0 0 100  timenow - ));
 DESCR("(internal)");
-DATA(insert OID = 251 (  abstimeeq                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  foo bar ));
+DATA(insert OID = 251 (  abstimeeq                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  abstimeeq - ));
 DESCR("equal");
-DATA(insert OID = 252 (  abstimene                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  foo bar ));
+DATA(insert OID = 252 (  abstimene                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  abstimene - ));
 DESCR("not equal");
-DATA(insert OID = 253 (  abstimelt                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  foo bar ));
+DATA(insert OID = 253 (  abstimelt                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  abstimelt - ));
 DESCR("less-than");
-DATA(insert OID = 254 (  abstimegt                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  foo bar ));
+DATA(insert OID = 254 (  abstimegt                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  abstimegt - ));
 DESCR("greater-than");
-DATA(insert OID = 255 (  abstimele                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  foo bar ));
+DATA(insert OID = 255 (  abstimele                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  abstimele - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 256 (  abstimege                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  foo bar ));
+DATA(insert OID = 256 (  abstimege                PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100  abstimege - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 257 (  reltimeeq                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 257 (  reltimeeq                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  reltimeeq - ));
 DESCR("equal");
-DATA(insert OID = 258 (  reltimene                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 258 (  reltimene                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  reltimene - ));
 DESCR("not equal");
-DATA(insert OID = 259 (  reltimelt                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 259 (  reltimelt                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  reltimelt - ));
 DESCR("less-than");
-DATA(insert OID = 260 (  reltimegt                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 260 (  reltimegt                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  reltimegt - ));
 DESCR("greater-than");
-DATA(insert OID = 261 (  reltimele                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 261 (  reltimele                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  reltimele - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 262 (  reltimege                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 262 (  reltimege                PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100  reltimege - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 263 (  intervalsame     PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 263 (  intervalsame     PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervalsame - ));
 DESCR("same as");
-DATA(insert OID = 264 (  intervalct               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 264 (  intervalct               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervalct - ));
 DESCR("less-than");
-DATA(insert OID = 265 (  intervalov               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 265 (  intervalov               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervalov - ));
 DESCR("overlaps");
-DATA(insert OID = 266 (  intervalleneq    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 266 (  intervalleneq    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  intervalleneq - ));
 DESCR("length equal");
-DATA(insert OID = 267 (  intervallenne    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 267 (  intervallenne    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  intervallenne - ));
 DESCR("length not equal to");
-DATA(insert OID = 268 (  intervallenlt    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 268 (  intervallenlt    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  intervallenlt - ));
 DESCR("length less-than");
-DATA(insert OID = 269 (  intervallengt    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 269 (  intervallengt    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  intervallengt - ));
 DESCR("length greater-than");
-DATA(insert OID = 270 (  intervallenle    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 270 (  intervallenle    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  intervallenle - ));
 DESCR("length less-than-or-equal");
-DATA(insert OID = 271 (  intervallenge    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  foo bar ));
+DATA(insert OID = 271 (  intervallenge    PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100  intervallenge - ));
 DESCR("length greater-than-or-equal");
-DATA(insert OID = 272 (  intervalstart    PGUID 11 f t f 1 f 702 "704" 100 0 0 100  foo bar ));
+DATA(insert OID = 272 (  intervalstart    PGUID 11 f t f 1 f 702 "704" 100 0 0 100  intervalstart - ));
 DESCR("start of interval");
-DATA(insert OID = 273 (  intervalend      PGUID 11 f t f 1 f 702 "704" 100 0 0 100  foo bar ));
+DATA(insert OID = 273 (  intervalend      PGUID 11 f t f 1 f 702 "704" 100 0 0 100  intervalend - ));
 DESCR("");
-DATA(insert OID = 274 (  timeofday                PGUID 11 f t f 0 f 25 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 274 (  timeofday                PGUID 11 f t f 0 f 25 "0" 100 0 0 100  timeofday - ));
 DESCR("(internal)");
-DATA(insert OID = 275 (  abstime_finite    PGUID 11 f t f 1 f 16 "702" 100 0 0 100     foo bar ));
+DATA(insert OID = 275 (  abstime_finite    PGUID 11 f t f 1 f 16 "702" 100 0 0 100     abstime_finite - ));
 DESCR("");
 
-DATA(insert OID = 276 (  int2fac                  PGUID 11 f t f 1 f 21 "21" 100 0 0 100  foo bar ));
+DATA(insert OID = 276 (  int2fac                  PGUID 11 f t f 1 f 21 "21" 100 0 0 100  int2fac - ));
 DESCR("");
 
-DATA(insert OID = 277 (  inter_sl                 PGUID 11 f t f 2 f 16 "601 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 277 (  inter_sl                 PGUID 11 f t f 2 f 16 "601 628" 100 0 0 100  inter_sl - ));
 DESCR("");
-DATA(insert OID = 278 (  inter_lb                 PGUID 11 f t f 2 f 16 "628 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 278 (  inter_lb                 PGUID 11 f t f 2 f 16 "628 603" 100 0 0 100  inter_lb - ));
 DESCR("");
 
-DATA(insert OID = 279 (  float48mul               PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 279 (  float48mul               PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  float48mul - ));
 DESCR("multiply");
-DATA(insert OID = 280 (  float48div               PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 280 (  float48div               PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  float48div - ));
 DESCR("divide");
-DATA(insert OID = 281 (  float48pl                PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 281 (  float48pl                PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  float48pl - ));
 DESCR("addition");
-DATA(insert OID = 282 (  float48mi                PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 282 (  float48mi                PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100  float48mi - ));
 DESCR("subtract");
-DATA(insert OID = 283 (  float84mul               PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 283 (  float84mul               PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  float84mul - ));
 DESCR("multiply");
-DATA(insert OID = 284 (  float84div               PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 284 (  float84div               PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  float84div - ));
 DESCR("divide");
-DATA(insert OID = 285 (  float84pl                PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 285 (  float84pl                PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  float84pl - ));
 DESCR("addition");
-DATA(insert OID = 286 (  float84mi                PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 286 (  float84mi                PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100  float84mi - ));
 DESCR("subtract");
 
-DATA(insert OID = 287 (  float4eq                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 287 (  float4eq                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  float4eq - ));
 DESCR("equal");
-DATA(insert OID = 288 (  float4ne                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 288 (  float4ne                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  float4ne - ));
 DESCR("not equal");
-DATA(insert OID = 289 (  float4lt                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 289 (  float4lt                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  float4lt - ));
 DESCR("less-than");
-DATA(insert OID = 290 (  float4le                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 290 (  float4le                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  float4le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 291 (  float4gt                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 291 (  float4gt                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  float4gt - ));
 DESCR("greater-than");
-DATA(insert OID = 292 (  float4ge                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 292 (  float4ge                 PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100  float4ge - ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 293 (  float8eq                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 293 (  float8eq                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  float8eq - ));
 DESCR("equal");
-DATA(insert OID = 294 (  float8ne                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 294 (  float8ne                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  float8ne - ));
 DESCR("not equal");
-DATA(insert OID = 295 (  float8lt                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 295 (  float8lt                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  float8lt - ));
 DESCR("less-than");
-DATA(insert OID = 296 (  float8le                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 296 (  float8le                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  float8le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 297 (  float8gt                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 297 (  float8gt                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  float8gt - ));
 DESCR("greater-than");
-DATA(insert OID = 298 (  float8ge                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 298 (  float8ge                 PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100  float8ge - ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 299 (  float48eq                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 299 (  float48eq                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  float48eq - ));
 DESCR("equal");
 
 /* OIDS 300 - 399 */
 
-DATA(insert OID = 300 (  float48ne                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 300 (  float48ne                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  float48ne - ));
 DESCR("not equal");
-DATA(insert OID = 301 (  float48lt                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 301 (  float48lt                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  float48lt - ));
 DESCR("less-than");
-DATA(insert OID = 302 (  float48le                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 302 (  float48le                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  float48le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 303 (  float48gt                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 303 (  float48gt                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  float48gt - ));
 DESCR("greater-than");
-DATA(insert OID = 304 (  float48ge                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 304 (  float48ge                PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100  float48ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 305 (  float84eq                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 305 (  float84eq                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  float84eq - ));
 DESCR("equal");
-DATA(insert OID = 306 (  float84ne                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 306 (  float84ne                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  float84ne - ));
 DESCR("not equal");
-DATA(insert OID = 307 (  float84lt                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 307 (  float84lt                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  float84lt - ));
 DESCR("less-than");
-DATA(insert OID = 308 (  float84le                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 308 (  float84le                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  float84le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 309 (  float84gt                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 309 (  float84gt                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  float84gt - ));
 DESCR("greater-than");
-DATA(insert OID = 310 (  float84ge                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 310 (  float84ge                PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100  float84ge - ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 311 (  ftod                     PGUID 11 f t f 1 f 701 "700" 100 0 0 100  foo bar ));
+DATA(insert OID = 311 (  ftod                     PGUID 11 f t f 1 f 701 "700" 100 0 0 100  ftod - ));
 DESCR("convert float4 to float8");
-DATA(insert OID = 312 (  dtof                     PGUID 11 f t f 1 f 700 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 312 (  dtof                     PGUID 11 f t f 1 f 700 "701" 100 0 0 100  dtof - ));
 DESCR("convert float8 to float4");
-DATA(insert OID = 313 (  i2toi4                           PGUID 11 f t f 1 f  23  "21" 100 0 0 100  foo bar ));
+DATA(insert OID = 313 (  i2toi4                           PGUID 11 f t f 1 f  23  "21" 100 0 0 100  i2toi4 - ));
 DESCR("convert int2 to int4");
-DATA(insert OID = 314 (  i4toi2                           PGUID 11 f t f 1 f  21  "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 314 (  i4toi2                           PGUID 11 f t f 1 f  21  "23" 100 0 0 100  i4toi2 - ));
 DESCR("convert int4 to int2");
-DATA(insert OID = 315 (  keyfirsteq               PGUID 11 f t f 2 f  16       "0 21" 100 0 0 100      foo bar ));
+DATA(insert OID = 315 (  keyfirsteq               PGUID 11 f t f 2 f  16       "0 21" 100 0 0 100      keyfirsteq - ));
 DESCR("");
-DATA(insert OID = 316 (  i4tod                    PGUID 11 f t f 1 f 701  "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 316 (  i4tod                    PGUID 11 f t f 1 f 701  "23" 100 0 0 100  i4tod - ));
 DESCR("convert int4 to float8");
-DATA(insert OID = 317 (  dtoi4                    PGUID 11 f t f 1 f  23 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 317 (  dtoi4                    PGUID 11 f t f 1 f  23 "701" 100 0 0 100  dtoi4 - ));
 DESCR("convert float8 to int4");
-DATA(insert OID = 318 (  i4tof                    PGUID 11 f t f 1 f 700  "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 318 (  i4tof                    PGUID 11 f t f 1 f 700  "23" 100 0 0 100  i4tof - ));
 DESCR("convert int4 to float4");
-DATA(insert OID = 319 (  ftoi4                    PGUID 11 f t f 1 f  23 "700" 100 0 0 100  foo bar ));
+DATA(insert OID = 319 (  ftoi4                    PGUID 11 f t f 1 f  23 "700" 100 0 0 100  ftoi4 - ));
 DESCR("convert float4 to int4");
 
-DATA(insert OID = 320 (  rtinsert                 PGUID 11 f t f 5 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 320 (  rtinsert                 PGUID 11 f t f 5 f 23 "0" 100 0 0 100  rtinsert - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 321 (  rtdelete                 PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 321 (  rtdelete                 PGUID 11 f t f 2 f 23 "0" 100 0 0 100  rtdelete - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 322 (  rtgettuple               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 322 (  rtgettuple               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  rtgettuple - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 323 (  rtbuild                  PGUID 11 f t f 9 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 323 (  rtbuild                  PGUID 11 f t f 9 f 23 "0" 100 0 0 100  rtbuild - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 324 (  rtbeginscan      PGUID 11 f t f 4 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 324 (  rtbeginscan      PGUID 11 f t f 4 f 23 "0" 100 0 0 100  rtbeginscan - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 325 (  rtendscan                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 325 (  rtendscan                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  rtendscan - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 326 (  rtmarkpos                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 326 (  rtmarkpos                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  rtmarkpos - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 327 (  rtrestrpos               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 327 (  rtrestrpos               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  rtrestrpos - ));
 DESCR("r-tree(internal)");
-DATA(insert OID = 328 (  rtrescan                 PGUID 11 f t f 3 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 328 (  rtrescan                 PGUID 11 f t f 3 f 23 "0" 100 0 0 100  rtrescan - ));
 DESCR("r-tree(internal)");
 
-DATA(insert OID = 330 (  btgettuple               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 330 (  btgettuple               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  btgettuple - ));
 DESCR("btree(internal)");
-DATA(insert OID = 331 (  btinsert                 PGUID 11 f t f 5 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 331 (  btinsert                 PGUID 11 f t f 5 f 23 "0" 100 0 0 100  btinsert - ));
 DESCR("btree(internal)");
-DATA(insert OID = 332 (  btdelete                 PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 332 (  btdelete                 PGUID 11 f t f 2 f 23 "0" 100 0 0 100  btdelete - ));
 DESCR("btree(internal)");
-DATA(insert OID = 333 (  btbeginscan      PGUID 11 f t f 4 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 333 (  btbeginscan      PGUID 11 f t f 4 f 23 "0" 100 0 0 100  btbeginscan - ));
 DESCR("btree(internal)");
-DATA(insert OID = 334 (  btrescan                 PGUID 11 f t f 3 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 334 (  btrescan                 PGUID 11 f t f 3 f 23 "0" 100 0 0 100  btrescan - ));
 DESCR("btree(internal)");
-DATA(insert OID = 335 (  btendscan                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 335 (  btendscan                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  btendscan - ));
 DESCR("btree(internal)");
-DATA(insert OID = 336 (  btmarkpos                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 336 (  btmarkpos                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  btmarkpos - ));
 DESCR("btree(internal)");
-DATA(insert OID = 337 (  btrestrpos               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 337 (  btrestrpos               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  btrestrpos - ));
 DESCR("btree(internal)");
-DATA(insert OID = 338 (  btbuild                  PGUID 11 f t f 9 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 338 (  btbuild                  PGUID 11 f t f 9 f 23 "0" 100 0 0 100  btbuild - ));
 DESCR("btree(internal)");
-DATA(insert OID = 339 (  poly_same                PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 339 (  poly_same                PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_same - ));
 DESCR("same as");
-DATA(insert OID = 340 (  poly_contain     PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 340 (  poly_contain     PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_contain - ));
 DESCR("contains");
-DATA(insert OID = 341 (  poly_left                PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 341 (  poly_left                PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_left - ));
 DESCR("is left of");
-DATA(insert OID = 342 (  poly_overleft    PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 342 (  poly_overleft    PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_overleft - ));
 DESCR("overlaps, but does not extend to right of");
-DATA(insert OID = 343 (  poly_overright    PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 343 (  poly_overright    PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_overright - ));
 DESCR("overlaps, but does not extend to left of");
-DATA(insert OID = 344 (  poly_right               PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 344 (  poly_right               PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_right - ));
 DESCR("is left of");
-DATA(insert OID = 345 (  poly_contained    PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 345 (  poly_contained    PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_contained - ));
 DESCR("contained in");
-DATA(insert OID = 346 (  poly_overlap     PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  foo bar ));
+DATA(insert OID = 346 (  poly_overlap     PGUID 11 f t f 2 f 16 "604 604" 100 0 1 0  poly_overlap - ));
 DESCR("overlaps");
-DATA(insert OID = 347 (  poly_in                  PGUID 11 f t f 1 f 604 "0" 100 0 1 0  foo bar ));
+DATA(insert OID = 347 (  poly_in                  PGUID 11 f t f 1 f 604 "0" 100 0 1 0  poly_in - ));
 DESCR("(internal)");
-DATA(insert OID = 348 (  poly_out                 PGUID 11 f t f 1 f 23  "0" 100 0 1 0  foo bar ));
+DATA(insert OID = 348 (  poly_out                 PGUID 11 f t f 1 f 23  "0" 100 0 1 0  poly_out - ));
 DESCR("(internal)");
 
-DATA(insert OID = 350 (  btint2cmp                PGUID 11 f t f 2 f 23 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 350 (  btint2cmp                PGUID 11 f t f 2 f 23 "21 21" 100 0 0 100  btint2cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 351 (  btint4cmp                PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 351 (  btint4cmp                PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  btint4cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 842 (  btint8cmp                PGUID 11 f t f 2 f 23 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 842 (  btint8cmp                PGUID 11 f t f 2 f 23 "20 20" 100 0 0 100  btint8cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 352 (  btint42cmp               PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 352 (  btint42cmp               PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100  btint42cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 353 (  btint24cmp               PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 353 (  btint24cmp               PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100  btint24cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 354 (  btfloat4cmp      PGUID 11 f t f 2 f 23 "700 700" 100 0 0 100  foo bar ));
+DATA(insert OID = 354 (  btfloat4cmp      PGUID 11 f t f 2 f 23 "700 700" 100 0 0 100  btfloat4cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 355 (  btfloat8cmp      PGUID 11 f t f 2 f 23 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 355 (  btfloat8cmp      PGUID 11 f t f 2 f 23 "701 701" 100 0 0 100  btfloat8cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 356 (  btoidcmp                 PGUID 11 f t f 2 f 23 "26 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 356 (  btoidcmp                 PGUID 11 f t f 2 f 23 "26 26" 100 0 0 100  btoidcmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 404 (  btoid8cmp                PGUID 11 f t f 2 f 23 "30 30" 100 0 0 100  foo bar ));
+DATA(insert OID = 404 (  btoid8cmp                PGUID 11 f t f 2 f 23 "30 30" 100 0 0 100  btoid8cmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 357 (  btabstimecmp     PGUID 11 f t f 2 f 23 "702 702" 100 0 0 100  foo bar ));
+DATA(insert OID = 357 (  btabstimecmp     PGUID 11 f t f 2 f 23 "702 702" 100 0 0 100  btabstimecmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 358 (  btcharcmp                PGUID 11 f t f 2 f 23 "18 18" 100 0 0 100  foo bar ));
+DATA(insert OID = 358 (  btcharcmp                PGUID 11 f t f 2 f 23 "18 18" 100 0 0 100  btcharcmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 359 (  btnamecmp                PGUID 11 f t f 2 f 23 "19 19" 100 0 0 100  foo bar ));
+DATA(insert OID = 359 (  btnamecmp                PGUID 11 f t f 2 f 23 "19 19" 100 0 0 100  btnamecmp - ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 360 (  bttextcmp                PGUID 11 f t f 2 f 23 "25 25" 100 0 0 100  foo bar ));
+DATA(insert OID = 360 (  bttextcmp                PGUID 11 f t f 2 f 23 "25 25" 100 0 0 100  bttextcmp - ));
 DESCR("btree less-equal-greater");
 
-DATA(insert OID = 361 (  lseg_distance    PGUID 11 f t f 2 f 701 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 361 (  lseg_distance    PGUID 11 f t f 2 f 701 "601 601" 100 0 0 100  lseg_distance - ));
 DESCR("distance between");
-DATA(insert OID = 362 (  lseg_interpt     PGUID 11 f t f 2 f 600 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 362 (  lseg_interpt     PGUID 11 f t f 2 f 600 "601 601" 100 0 0 100  lseg_interpt - ));
 DESCR("");
-DATA(insert OID = 363 (  dist_ps                  PGUID 11 f t f 2 f 701 "600 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 363 (  dist_ps                  PGUID 11 f t f 2 f 701 "600 601" 100 0 0 100  dist_ps - ));
 DESCR("distance between");
-DATA(insert OID = 364 (  dist_pb                  PGUID 11 f t f 2 f 701 "600 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 364 (  dist_pb                  PGUID 11 f t f 2 f 701 "600 603" 100 0 0 100  dist_pb - ));
 DESCR("distance between");
-DATA(insert OID = 365 (  dist_sb                  PGUID 11 f t f 2 f 701 "601 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 365 (  dist_sb                  PGUID 11 f t f 2 f 701 "601 603" 100 0 0 100  dist_sb - ));
 DESCR("distance between");
-DATA(insert OID = 366 (  close_ps                 PGUID 11 f t f 2 f 600 "600 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 366 (  close_ps                 PGUID 11 f t f 2 f 600 "600 601" 100 0 0 100  close_ps - ));
 DESCR("closest point on line segment");
-DATA(insert OID = 367 (  close_pb                 PGUID 11 f t f 2 f 600 "600 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 367 (  close_pb                 PGUID 11 f t f 2 f 600 "600 603" 100 0 0 100  close_pb - ));
 DESCR("closest point on box");
-DATA(insert OID = 368 (  close_sb                 PGUID 11 f t f 2 f 600 "601 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 368 (  close_sb                 PGUID 11 f t f 2 f 600 "601 603" 100 0 0 100  close_sb - ));
 DESCR("closest point to line segment on box");
-DATA(insert OID = 369 (  on_ps                    PGUID 11 f t f 2 f 16 "600 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 369 (  on_ps                    PGUID 11 f t f 2 f 16 "600 601" 100 0 0 100  on_ps - ));
 DESCR("contained in");
-DATA(insert OID = 370 (  path_distance    PGUID 11 f t f 2 f 701 "602 602" 100 0 1 0 foo bar ));
+DATA(insert OID = 370 (  path_distance    PGUID 11 f t f 2 f 701 "602 602" 100 0 1 0 path_distance - ));
 DESCR("distance between");
-DATA(insert OID = 371 (  dist_ppath               PGUID 11 f t f 2 f 701 "600 602" 100 0 1 0 foo bar ));
+DATA(insert OID = 371 (  dist_ppath               PGUID 11 f t f 2 f 701 "600 602" 100 0 1 0 dist_ppath - ));
 DESCR("distance between");
-DATA(insert OID = 372 (  on_sb                    PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 372 (  on_sb                    PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100  on_sb - ));
 DESCR("contained in");
-DATA(insert OID = 373 (  inter_sb                 PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 373 (  inter_sb                 PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100  inter_sb - ));
 DESCR("");
 
 /* OIDS 400 - 499 */
 
-DATA(insert OID =  406 (  name_text               PGUID 11 f t f 1 f   25 "19" 100 0 0 100 foo bar ));
+DATA(insert OID =  406 (  name_text               PGUID 11 f t f 1 f   25 "19" 100 0 0 100 name_text - ));
 DESCR("convert name to text");
-DATA(insert OID =  407 (  text_name               PGUID 11 f t f 1 f   19 "25" 100 0 0 100 foo bar ));
+DATA(insert OID =  407 (  text_name               PGUID 11 f t f 1 f   19 "25" 100 0 0 100 text_name - ));
 DESCR("convert text to name");
-DATA(insert OID =  408 (  name_bpchar     PGUID 11 f t f 1 f 1042 "19" 100 0 0 100 foo bar ));
+DATA(insert OID =  408 (  name_bpchar     PGUID 11 f t f 1 f 1042 "19" 100 0 0 100 name_bpchar - ));
 DESCR("convert name to char()");
-DATA(insert OID =  409 (  bpchar_name     PGUID 11 f t f 1 f   19 "1042" 100 0 0 100   foo bar ));
+DATA(insert OID =  409 (  bpchar_name     PGUID 11 f t f 1 f   19 "1042" 100 0 0 100   bpchar_name - ));
 DESCR("convert char() to name");
 
-DATA(insert OID =  438 (  hashsel                 PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID =  438 (  hashsel                 PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  hashsel - ));
 DESCR("selectivity");
-DATA(insert OID =  439 (  hashnpage               PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID =  439 (  hashnpage               PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  hashnpage - ));
 DESCR("hash");
 
-DATA(insert OID = 440 (  hashgettuple     PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 440 (  hashgettuple     PGUID 11 f t f 2 f 23 "0" 100 0 0 100  hashgettuple - ));
 DESCR("hash(internal)");
-DATA(insert OID = 441 (  hashinsert               PGUID 11 f t f 5 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 441 (  hashinsert               PGUID 11 f t f 5 f 23 "0" 100 0 0 100  hashinsert - ));
 DESCR("hash(internal)");
-DATA(insert OID = 442 (  hashdelete               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 442 (  hashdelete               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  hashdelete - ));
 DESCR("hash(internal)");
-DATA(insert OID = 443 (  hashbeginscan    PGUID 11 f t f 4 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 443 (  hashbeginscan    PGUID 11 f t f 4 f 23 "0" 100 0 0 100  hashbeginscan - ));
 DESCR("hash(internal)");
-DATA(insert OID = 444 (  hashrescan               PGUID 11 f t f 3 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 444 (  hashrescan               PGUID 11 f t f 3 f 23 "0" 100 0 0 100  hashrescan - ));
 DESCR("hash(internal)");
-DATA(insert OID = 445 (  hashendscan      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 445 (  hashendscan      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  hashendscan - ));
 DESCR("hash(internal)");
-DATA(insert OID = 446 (  hashmarkpos      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 446 (  hashmarkpos      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  hashmarkpos - ));
 DESCR("hash(internal)");
-DATA(insert OID = 447 (  hashrestrpos     PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 447 (  hashrestrpos     PGUID 11 f t f 1 f 23 "0" 100 0 0 100  hashrestrpos - ));
 DESCR("hash(internal)");
-DATA(insert OID = 448 (  hashbuild                PGUID 11 f t f 9 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 448 (  hashbuild                PGUID 11 f t f 9 f 23 "0" 100 0 0 100  hashbuild - ));
 DESCR("hash(internal)");
-DATA(insert OID = 449 (  hashint2                 PGUID 11 f t f 1 f 23 "21" 100 0 0 100  foo bar ));
+DATA(insert OID = 449 (  hashint2                 PGUID 11 f t f 1 f 23 "21" 100 0 0 100  hashint2 - ));
 DESCR("hash");
-DATA(insert OID = 450 (  hashint4                 PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 450 (  hashint4                 PGUID 11 f t f 1 f 23 "23" 100 0 0 100  hashint4 - ));
 DESCR("hash");
-DATA(insert OID = 949 (  hashint8                 PGUID 11 f t f 1 f 23 "20" 100 0 0 100  foo bar ));
+DATA(insert OID = 949 (  hashint8                 PGUID 11 f t f 1 f 23 "20" 100 0 0 100  hashint8 - ));
 DESCR("hash");
-DATA(insert OID = 451 (  hashfloat4               PGUID 11 f t f 1 f 23 "700" 100 0 0 100      foo bar ));
+DATA(insert OID = 451 (  hashfloat4               PGUID 11 f t f 1 f 23 "700" 100 0 0 100      hashfloat4 - ));
 DESCR("hash");
-DATA(insert OID = 452 (  hashfloat8               PGUID 11 f t f 1 f 23 "701" 100 0 0 100      foo bar ));
+DATA(insert OID = 452 (  hashfloat8               PGUID 11 f t f 1 f 23 "701" 100 0 0 100      hashfloat8 - ));
 DESCR("hash");
-DATA(insert OID = 453 (  hashoid                  PGUID 11 f t f 1 f 23 "26" 100 0 0 100  foo bar ));
+DATA(insert OID = 453 (  hashoid                  PGUID 11 f t f 1 f 23 "26" 100 0 0 100  hashoid - ));
 DESCR("hash");
-DATA(insert OID = 454 (  hashchar                 PGUID 11 f t f 1 f 23 "18" 100 0 0 100  foo bar ));
+DATA(insert OID = 454 (  hashchar                 PGUID 11 f t f 1 f 23 "18" 100 0 0 100  hashchar - ));
 DESCR("hash");
-DATA(insert OID = 455 (  hashname                 PGUID 11 f t f 1 f 23 "19" 100 0 0 100  foo bar ));
+DATA(insert OID = 455 (  hashname                 PGUID 11 f t f 1 f 23 "19" 100 0 0 100  hashname - ));
 DESCR("hash");
-DATA(insert OID = 456 (  hashtext                 PGUID 11 f t f 1 f 23 "25" 100 0 0 100  foo bar ));
+DATA(insert OID = 456 (  hashtext                 PGUID 11 f t f 1 f 23 "25" 100 0 0 100  hashtext - ));
 DESCR("hash");
-DATA(insert OID = 457 (  hashoid8                 PGUID 11 f t f 1 f 23 "30" 100 0 0 100  foo bar ));
+DATA(insert OID = 457 (  hashoid8                 PGUID 11 f t f 1 f 23 "30" 100 0 0 100  hashoid8 - ));
 DESCR("hash");
-DATA(insert OID = 458 (  text_larger      PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  foo bar ));
+DATA(insert OID = 458 (  text_larger      PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  text_larger - ));
 DESCR("larger of two");
-DATA(insert OID = 459 (  text_smaller     PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  foo bar ));
+DATA(insert OID = 459 (  text_smaller     PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  text_smaller - ));
 DESCR("smaller of two");
 
-DATA(insert OID = 460 (  int8in                           PGUID 11 f t f 1 f 20 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 460 (  int8in                           PGUID 11 f t f 1 f 20 "0" 100 0 0 100  int8in - ));
 DESCR("(internal)");
-DATA(insert OID = 461 (  int8out                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 461 (  int8out                  PGUID 11 f t f 1 f 23 "0" 100 0 0 100  int8out - ));
 DESCR("(internal)");
-DATA(insert OID = 462 (  int8um                           PGUID 11 f t f 1 f 20 "20" 100 0 0 100  foo bar ));
+DATA(insert OID = 462 (  int8um                           PGUID 11 f t f 1 f 20 "20" 100 0 0 100  int8um - ));
 DESCR("unary minus");
-DATA(insert OID = 463 (  int8pl                           PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 463 (  int8pl                           PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  int8pl - ));
 DESCR("addition");
-DATA(insert OID = 464 (  int8mi                           PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 464 (  int8mi                           PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  int8mi - ));
 DESCR("subtraction");
-DATA(insert OID = 465 (  int8mul                  PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 465 (  int8mul                  PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  int8mul - ));
 DESCR("multiply");
-DATA(insert OID = 466 (  int8div                  PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 466 (  int8div                  PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  int8div - ));
 DESCR("divide");
-DATA(insert OID = 467 (  int8eq                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 467 (  int8eq                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  int8eq - ));
 DESCR("equal");
-DATA(insert OID = 468 (  int8ne                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 468 (  int8ne                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  int8ne - ));
 DESCR("not equal");
-DATA(insert OID = 469 (  int8lt                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 469 (  int8lt                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  int8lt - ));
 DESCR("less-than");
-DATA(insert OID = 470 (  int8gt                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 470 (  int8gt                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  int8gt - ));
 DESCR("greater-than");
-DATA(insert OID = 471 (  int8le                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 471 (  int8le                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  int8le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 472 (  int8ge                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 472 (  int8ge                           PGUID 11 f t f 2 f 16 "20 20" 100 0 0 100  int8ge - ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 474 (  int84eq                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 474 (  int84eq                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  int84eq - ));
 DESCR("equal");
-DATA(insert OID = 475 (  int84ne                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 475 (  int84ne                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  int84ne - ));
 DESCR("not equal");
-DATA(insert OID = 476 (  int84lt                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 476 (  int84lt                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  int84lt - ));
 DESCR("less-than");
-DATA(insert OID = 477 (  int84gt                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 477 (  int84gt                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  int84gt - ));
 DESCR("greater-than");
-DATA(insert OID = 478 (  int84le                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 478 (  int84le                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  int84le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 479 (  int84ge                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 479 (  int84ge                  PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100  int84ge - ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 480 (  int84                    PGUID 11 f t f 1 f  23 "20" 100 0 0 100      foo bar ));
+DATA(insert OID = 480 (  int84                    PGUID 11 f t f 1 f  23 "20" 100 0 0 100      int84 - ));
 DESCR("convert int8 to int4");
-DATA(insert OID = 481 (  int48                    PGUID 11 f t f 1 f  20 "23" 100 0 0 100      foo bar ));
+DATA(insert OID = 481 (  int48                    PGUID 11 f t f 1 f  20 "23" 100 0 0 100      int48 - ));
 DESCR("convert int4 to int8");
-DATA(insert OID = 482 (  i8tod                    PGUID 11 f t f 1 f 701 "20" 100 0 0 100      foo bar ));
+DATA(insert OID = 482 (  i8tod                    PGUID 11 f t f 1 f 701 "20" 100 0 0 100      i8tod - ));
 DESCR("convert int8 to float8");
-DATA(insert OID = 483 (  dtoi8                    PGUID 11 f t f 1 f  20 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 483 (  dtoi8                    PGUID 11 f t f 1 f  20 "701" 100 0 0 100  dtoi8 - ));
 DESCR("convert float8 to int8");
 
 /* OIDS 500 - 599 */
 
 /* OIDS 600 - 699 */
 
-DATA(insert OID = 1285 (  int4notin               PGUID 11 f t f 2 f 16 "23 0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1285 (  int4notin               PGUID 11 f t f 2 f 16 "23 0" 100 0 0 100  int4notin - ));
 DESCR("not in");
-DATA(insert OID = 1286 (  oidnotin                PGUID 11 f t f 2 f 16 "26 0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1286 (  oidnotin                PGUID 11 f t f 2 f 16 "26 0" 100 0 0 100  oidnotin - ));
 DESCR("not in");
-DATA(insert OID = 1287 (  int44in                 PGUID 11 f t f 1 f 22 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1287 (  int44in                 PGUID 11 f t f 1 f 22 "0" 100 0 0 100  int44in - ));
 DESCR("(internal)");
-DATA(insert OID = 653 (  int44out                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 653 (  int44out                 PGUID 11 f t f 1 f 23 "0" 100 0 0 100  int44out - ));
 DESCR("(internal)");
-DATA(insert OID = 655 (  namelt                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  foo bar ));
+DATA(insert OID = 655 (  namelt                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  namelt - ));
 DESCR("less-than");
-DATA(insert OID = 656 (  namele                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  foo bar ));
+DATA(insert OID = 656 (  namele                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  namele - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 657 (  namegt                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  foo bar ));
+DATA(insert OID = 657 (  namegt                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  namegt - ));
 DESCR("greater-than");
-DATA(insert OID = 658 (  namege                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  foo bar ));
+DATA(insert OID = 658 (  namege                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  namege - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 659 (  namene                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  foo bar ));
+DATA(insert OID = 659 (  namene                           PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  namene - ));
 DESCR("not equal");
 
-DATA(insert OID = 668 (  bpchar                           PGUID 11 f t f 2 f 1042 "1042 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 668 (  bpchar                           PGUID 11 f t f 2 f 1042 "1042 23" 100 0 0 100  bpchar - ));
 DESCR("truncate char()");
-DATA(insert OID = 669 (  varchar                  PGUID 11 f t f 2 f 1043 "1043 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 669 (  varchar                  PGUID 11 f t f 2 f 1043 "1043 23" 100 0 0 100  varchar - ));
 DESCR("truncate varchar()");
 
-DATA(insert OID = 676 (  mktinterval      PGUID 11 f t f 2 f 704 "702 702" 100 0 0 100 foo bar ));
+DATA(insert OID = 676 (  mktinterval      PGUID 11 f t f 2 f 704 "702 702" 100 0 0 100 mktinterval - ));
 DESCR("convert to interval");
-DATA(insert OID = 619 (  oid8ne                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  foo bar ));
+DATA(insert OID = 619 (  oid8ne                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  oid8ne - ));
 DESCR("less-than");
-DATA(insert OID = 677 (  oid8lt                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  foo bar ));
+DATA(insert OID = 677 (  oid8lt                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  oid8lt - ));
 DESCR("less-than");
-DATA(insert OID = 678 (  oid8le                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  foo bar ));
+DATA(insert OID = 678 (  oid8le                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  oid8le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 679 (  oid8eq                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  foo bar ));
+DATA(insert OID = 679 (  oid8eq                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  oid8eq - ));
 DESCR("equal");
-DATA(insert OID = 680 (  oid8ge                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  foo bar ));
+DATA(insert OID = 680 (  oid8ge                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  oid8ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 681 (  oid8gt                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  foo bar ));
+DATA(insert OID = 681 (  oid8gt                           PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100  oid8gt - ));
 DESCR("greater-than");
 
 /* OIDS 700 - 799 */
-DATA(insert OID = 710 (  getpgusername    PGUID 11 f t f 0 f 19 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 710 (  getpgusername    PGUID 11 f t f 0 f 19 "0" 100 0 0 100  getpgusername - ));
 DESCR("(internal)");
-DATA(insert OID = 711 (  userfntest               PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 711 (  userfntest               PGUID 11 f t f 1 f 23 "23" 100 0 0 100  userfntest - ));
 DESCR("");
-DATA(insert OID = 713 (  oidrand                  PGUID 11 f t f 2 f 16 "26 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 713 (  oidrand                  PGUID 11 f t f 2 f 16 "26 23" 100 0 0 100  oidrand - ));
 DESCR("random");
-DATA(insert OID = 715 (  oidsrand                 PGUID 11 f t f 1 f 16 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 715 (  oidsrand                 PGUID 11 f t f 1 f 16 "23" 100 0 0 100  oidsrand - ));
 DESCR("seed random number generator");
-DATA(insert OID = 716 (  oideqint4                PGUID 11 f t f 2 f 16 "26 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 716 (  oideqint4                PGUID 11 f t f 2 f 16 "26 23" 100 0 0 100  oideqint4 - ));
 DESCR("equal");
-DATA(insert OID = 717 (  int4eqoid                PGUID 11 f t f 2 f 16 "23 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 717 (  int4eqoid                PGUID 11 f t f 2 f 16 "23 26" 100 0 0 100  int4eqoid - ));
 DESCR("equal");
 
-DATA(insert OID = 720 (  byteaGetSize     PGUID 11 f t f 1 f 23 "17" 100 0 0 100  foo bar ));
+DATA(insert OID = 720 (  byteaGetSize     PGUID 11 f t f 1 f 23 "17" 100 0 0 100  byteaGetSize - ));
 DESCR("");
-DATA(insert OID = 721 (  byteaGetByte     PGUID 11 f t f 2 f 23 "17 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 721 (  byteaGetByte     PGUID 11 f t f 2 f 23 "17 23" 100 0 0 100  byteaGetByte - ));
 DESCR("");
-DATA(insert OID = 722 (  byteaSetByte     PGUID 11 f t f 3 f 17 "17 23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 722 (  byteaSetByte     PGUID 11 f t f 3 f 17 "17 23 23" 100 0 0 100  byteaSetByte - ));
 DESCR("");
-DATA(insert OID = 723 (  byteaGetBit      PGUID 11 f t f 2 f 23 "17 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 723 (  byteaGetBit      PGUID 11 f t f 2 f 23 "17 23" 100 0 0 100  byteaGetBit - ));
 DESCR("");
-DATA(insert OID = 724 (  byteaSetBit      PGUID 11 f t f 3 f 17 "17 23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 724 (  byteaSetBit      PGUID 11 f t f 3 f 17 "17 23 23" 100 0 0 100  byteaSetBit - ));
 DESCR("");
 
-DATA(insert OID = 725 (  dist_pl                  PGUID 11 f t f 2 f 701 "600 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 725 (  dist_pl                  PGUID 11 f t f 2 f 701 "600 628" 100 0 0 100  dist_pl - ));
 DESCR("distance between");
-DATA(insert OID = 726 (  dist_lb                  PGUID 11 f t f 2 f 701 "628 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 726 (  dist_lb                  PGUID 11 f t f 2 f 701 "628 603" 100 0 0 100  dist_lb - ));
 DESCR("distance between");
-DATA(insert OID = 727 (  dist_sl                  PGUID 11 f t f 2 f 701 "601 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 727 (  dist_sl                  PGUID 11 f t f 2 f 701 "601 628" 100 0 0 100  dist_sl - ));
 DESCR("distance between");
-DATA(insert OID = 728 (  dist_cpoly               PGUID 11 f t f 2 f 701 "718 604" 100 0 0 100  foo bar ));
+DATA(insert OID = 728 (  dist_cpoly               PGUID 11 f t f 2 f 701 "718 604" 100 0 0 100  dist_cpoly - ));
 DESCR("distance between");
-DATA(insert OID = 729 (  poly_distance    PGUID 11 f t f 2 f 701 "604 604" 100 0 0 100  foo bar ));
+DATA(insert OID = 729 (  poly_distance    PGUID 11 f t f 2 f 701 "604 604" 100 0 0 100  poly_distance - ));
 DESCR("distance between");
 
-DATA(insert OID = 730 (  pqtest                           PGUID 11 f t f 1 f 23 "25" 100 0 0 100  foo bar ));
+DATA(insert OID = 730 (  pqtest                           PGUID 11 f t f 1 f 23 "25" 100 0 0 100  pqtest - ));
 DESCR("");
 
-DATA(insert OID = 740 (  text_lt                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      foo bar ));
+DATA(insert OID = 740 (  text_lt                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      text_lt - ));
 DESCR("less-than");
-DATA(insert OID = 741 (  text_le                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      foo bar ));
+DATA(insert OID = 741 (  text_le                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      text_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 742 (  text_gt                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      foo bar ));
+DATA(insert OID = 742 (  text_gt                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      text_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 743 (  text_ge                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      foo bar ));
+DATA(insert OID = 743 (  text_ge                  PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0      text_ge - ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 744 (  array_eq                 PGUID 11 f t f 2 f 16 "0 0" 100 0 0 100 foo bar));
+DATA(insert OID = 744 (  array_eq                 PGUID 11 f t f 2 f 16 "0 0" 100 0 0 100 array_eq -));
 DESCR("equal");
-DATA(insert OID = 745 (  array_assgn      PGUID 11 f t f 8 f 23 "0 23 0 0 0 23 23 0" 100 0 0 100 foo bar));
+DATA(insert OID = 745 (  array_assgn      PGUID 11 f t f 8 f 23 "0 23 0 0 0 23 23 0" 100 0 0 100 array_assgn -));
 DESCR("array");
-DATA(insert OID = 746 (  array_clip               PGUID 11 f t f 7 f 23 "0 23 0 0 23 23 0" 100 0 0 100 foo bar));
+DATA(insert OID = 746 (  array_clip               PGUID 11 f t f 7 f 23 "0 23 0 0 23 23 0" 100 0 0 100 array_clip -));
 DESCR("array");
-DATA(insert OID = 747 (  array_dims               PGUID 11 f t f 1 f 25 "0" 100 0 0 100 foo bar));
+DATA(insert OID = 747 (  array_dims               PGUID 11 f t f 1 f 25 "0" 100 0 0 100 array_dims -));
 DESCR("array(internal)");
-DATA(insert OID = 748 (  array_set                PGUID 11 f t f 8 f 23 "0 23 0 0 23 23 23 0" 100 0 0 100 foo bar));
+DATA(insert OID = 748 (  array_set                PGUID 11 f t f 8 f 23 "0 23 0 0 23 23 23 0" 100 0 0 100 array_set -));
 DESCR("array");
-DATA(insert OID = 749 (  array_ref                PGUID 11 f t f 7 f 23 "0 23 0 23 23 23 0" 100 0 0 100 foo bar));
+DATA(insert OID = 749 (  array_ref                PGUID 11 f t f 7 f 23 "0 23 0 23 23 23 0" 100 0 0 100 array_ref -));
 DESCR("array");
-DATA(insert OID = 750 (  array_in                 PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100      foo bar ));
+DATA(insert OID = 750 (  array_in                 PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100      array_in - ));
 DESCR("array");
-DATA(insert OID = 751 (  array_out                PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100      foo bar ));
+DATA(insert OID = 751 (  array_out                PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100      array_out - ));
 DESCR("array");
 
-DATA(insert OID = 752 (  filename_in      PGUID 11 f t f 2 f 605 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 752 (  filename_in      PGUID 11 f t f 2 f 605 "0" 100 0 0 100  filename_in - ));
 DESCR("(internal)");
-DATA(insert OID = 753 (  filename_out     PGUID 11 f t f 2 f 19  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 753 (  filename_out     PGUID 11 f t f 2 f 19  "0" 100 0 0 100  filename_out - ));
 DESCR("(internal)");
 
-DATA(insert OID = 760 (  smgrin                           PGUID 11 f t f 1 f 210 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 760 (  smgrin                           PGUID 11 f t f 1 f 210 "0" 100 0 0 100  smgrin - ));
 DESCR("storage manager(internal)");
-DATA(insert OID = 761 (  smgrout                  PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 761 (  smgrout                  PGUID 11 f t f 1 f 23  "0" 100 0 0 100  smgrout - ));
 DESCR("storage manager(internal)");
-DATA(insert OID = 762 (  smgreq                           PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100  foo bar ));
+DATA(insert OID = 762 (  smgreq                           PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100  smgreq - ));
 DESCR("storage manager");
-DATA(insert OID = 763 (  smgrne                           PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100  foo bar ));
+DATA(insert OID = 763 (  smgrne                           PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100  smgrne - ));
 DESCR("storage manager");
 
-DATA(insert OID = 764 (  lo_import                PGUID 11 f t f 1 f 26 "25" 100 0 0 100  foo bar ));
+DATA(insert OID = 764 (  lo_import                PGUID 11 f t f 1 f 26 "25" 100 0 0 100  lo_import - ));
 DESCR("large object import");
-DATA(insert OID = 765 (  lo_export                PGUID 11 f t f 2 f 23 "26 25" 100 0 0 100  foo bar ));
+DATA(insert OID = 765 (  lo_export                PGUID 11 f t f 2 f 23 "26 25" 100 0 0 100  lo_export - ));
 DESCR("large object export");
 
-DATA(insert OID = 766 (  int4inc                  PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 766 (  int4inc                  PGUID 11 f t f 1 f 23 "23" 100 0 0 100  int4inc - ));
 DESCR("increment");
-DATA(insert OID = 767 (  int2inc                  PGUID 11 f t f 1 f 21 "21" 100 0 0 100  foo bar ));
+DATA(insert OID = 767 (  int2inc                  PGUID 11 f t f 1 f 21 "21" 100 0 0 100  int2inc - ));
 DESCR("increment");
-DATA(insert OID = 768 (  int4larger               PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 768 (  int4larger               PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  int4larger - ));
 DESCR("larger of two");
-DATA(insert OID = 769 (  int4smaller      PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 769 (  int4smaller      PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100  int4smaller - ));
 DESCR("smaller of two");
-DATA(insert OID = 770 (  int2larger               PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 770 (  int2larger               PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  int2larger - ));
 DESCR("larger of two");
-DATA(insert OID = 771 (  int2smaller      PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
+DATA(insert OID = 771 (  int2smaller      PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  int2smaller - ));
 DESCR("smaller of two");
-DATA(insert OID = 772 (  gistsel                  PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 772 (  gistsel                  PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  gistsel - ));
 DESCR("gist selectivity");
-DATA(insert OID = 773 (  gistnpage                PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  foo bar ));
+DATA(insert OID = 773 (  gistnpage                PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100  gistnpage - ));
 DESCR("gist");
-DATA(insert OID = 774 (  gistgettuple     PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 774 (  gistgettuple     PGUID 11 f t f 2 f 23 "0" 100 0 0 100  gistgettuple - ));
 DESCR("gist(internal)");
-DATA(insert OID = 775 (  gistinsert               PGUID 11 f t f 5 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 775 (  gistinsert               PGUID 11 f t f 5 f 23 "0" 100 0 0 100  gistinsert - ));
 DESCR("gist(internal)");
-DATA(insert OID = 776 (  gistdelete               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 776 (  gistdelete               PGUID 11 f t f 2 f 23 "0" 100 0 0 100  gistdelete - ));
 DESCR("gist(internal)");
-DATA(insert OID = 777 (  gistbeginscan    PGUID 11 f t f 4 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 777 (  gistbeginscan    PGUID 11 f t f 4 f 23 "0" 100 0 0 100  gistbeginscan - ));
 DESCR("gist(internal)");
-DATA(insert OID = 778 (  gistrescan               PGUID 11 f t f 3 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 778 (  gistrescan               PGUID 11 f t f 3 f 23 "0" 100 0 0 100  gistrescan - ));
 DESCR("gist(internal)");
-DATA(insert OID = 779 (  gistendscan      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 779 (  gistendscan      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  gistendscan - ));
 DESCR("gist(internal)");
-DATA(insert OID = 780 (  gistmarkpos      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 780 (  gistmarkpos      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  gistmarkpos - ));
 DESCR("gist(internal)");
-DATA(insert OID = 781 (  gistrestrpos     PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 781 (  gistrestrpos     PGUID 11 f t f 1 f 23 "0" 100 0 0 100  gistrestrpos - ));
 DESCR("gist(internal)");
-DATA(insert OID = 782 (  gistbuild                PGUID 11 f t f 9 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 782 (  gistbuild                PGUID 11 f t f 9 f 23 "0" 100 0 0 100  gistbuild - ));
 DESCR("gist(internal)");
 
-DATA(insert OID = 784 (  intervaleq               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 784 (  intervaleq               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervaleq - ));
 DESCR("equal");
-DATA(insert OID = 785 (  intervalne               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 785 (  intervalne               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervalne - ));
 DESCR("not equal");
-DATA(insert OID = 786 (  intervallt               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 786 (  intervallt               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervallt - ));
 DESCR("less-than");
-DATA(insert OID = 787 (  intervalgt               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 787 (  intervalgt               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervalgt - ));
 DESCR("greater-than");
-DATA(insert OID = 788 (  intervalle               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 788 (  intervalle               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervalle - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 789 (  intervalge               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  foo bar ));
+DATA(insert OID = 789 (  intervalge               PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100  intervalge - ));
 DESCR("greater-than-or-equal");
 
 /* OIDS 800 - 899 */
 
-DATA(insert OID = 817 (  text_oid                 PGUID 11 f t f 1 f 26 "25" 100 0 0 100  foo bar));
+DATA(insert OID = 817 (  text_oid                 PGUID 11 f t f 1 f 26 "25" 100 0 0 100  text_oid -));
 DESCR("convert text to oid");
-DATA(insert OID = 818 (  text_int2                PGUID 11 f t f 1 f 21 "25" 100 0 0 100  foo bar));
+DATA(insert OID = 818 (  text_int2                PGUID 11 f t f 1 f 21 "25" 100 0 0 100  text_int2 -));
 DESCR("convert text to int2");
-DATA(insert OID = 819 (  text_int4                PGUID 11 f t f 1 f 23 "25" 100 0 0 100  foo bar));
+DATA(insert OID = 819 (  text_int4                PGUID 11 f t f 1 f 23 "25" 100 0 0 100  text_int4 -));
 DESCR("convert text to int4");
 
-DATA(insert OID = 838 (  text_float8      PGUID 11 f t f 1 f 701 "25" 100 0 0 100  foo bar));
+DATA(insert OID = 838 (  text_float8      PGUID 11 f t f 1 f 701 "25" 100 0 0 100  text_float8 -));
 DESCR("convert text to float8");
-DATA(insert OID = 839 (  text_float4      PGUID 11 f t f 1 f 700 "25" 100 0 0 100  foo bar));
+DATA(insert OID = 839 (  text_float4      PGUID 11 f t f 1 f 700 "25" 100 0 0 100  text_float4 -));
 DESCR("convert text to float4");
-DATA(insert OID = 840 (  float8_text      PGUID 11 f t f 1 f  25 "701" 100 0 0 100  foo bar));
+DATA(insert OID = 840 (  float8_text      PGUID 11 f t f 1 f  25 "701" 100 0 0 100  float8_text -));
 DESCR("convert float8 to text");
-DATA(insert OID = 841 (  float4_text      PGUID 11 f t f 1 f  25 "700" 100 0 0 100  foo bar));
+DATA(insert OID = 841 (  float4_text      PGUID 11 f t f 1 f  25 "700" 100 0 0 100  float4_text -));
 DESCR("convert float4 to text");
 
-DATA(insert OID =  846 (  cash_mul_flt4    PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  foo bar ));
+DATA(insert OID =  846 (  cash_mul_flt4    PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  cash_mul_flt4 - ));
 DESCR("multiply");
-DATA(insert OID =  847 (  cash_div_flt4    PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  foo bar ));
+DATA(insert OID =  847 (  cash_div_flt4    PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100  cash_div_flt4 - ));
 DESCR("divide");
-DATA(insert OID =  848 (  flt4_mul_cash    PGUID 11 f t f 2 f 790 "700 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  848 (  flt4_mul_cash    PGUID 11 f t f 2 f 790 "700 790" 100 0 0 100  flt4_mul_cash - ));
 DESCR("multiply");
 
-DATA(insert OID =  849 (  textpos                 PGUID 11 f t f 2 f 23 "25 25" 100 0 1 0 foo bar ));
+DATA(insert OID =  849 (  textpos                 PGUID 11 f t f 2 f 23 "25 25" 100 0 1 0 textpos - ));
 DESCR("return position of substring");
-DATA(insert OID =  850 (  textlike                PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar ));
+DATA(insert OID =  850 (  textlike                PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 textlike - ));
 DESCR("matches LIKE expression");
-DATA(insert OID =  851 (  textnlike               PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar ));
+DATA(insert OID =  851 (  textnlike               PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 textnlike - ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID =  852 (  int48eq                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID =  852 (  int48eq                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  int48eq - ));
 DESCR("equal");
-DATA(insert OID =  853 (  int48ne                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID =  853 (  int48ne                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  int48ne - ));
 DESCR("not equal");
-DATA(insert OID =  854 (  int48lt                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID =  854 (  int48lt                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  int48lt - ));
 DESCR("less-than");
-DATA(insert OID =  855 (  int48gt                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID =  855 (  int48gt                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  int48gt - ));
 DESCR("greater-than");
-DATA(insert OID =  856 (  int48le                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID =  856 (  int48le                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  int48le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  857 (  int48ge                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID =  857 (  int48ge                 PGUID 11 f t f 2 f 16 "23 20" 100 0 0 100  int48ge - ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID =  858 (  namelike                PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  858 (  namelike                PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  namelike - ));
 DESCR("matches LIKE expression");
-DATA(insert OID =  859 (  namenlike               PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  859 (  namenlike               PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  namenlike - ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID =  860 (  char_bpchar     PGUID 11 f t f 1 f 1042 "18" 100 0 0 100  foo bar ));
+DATA(insert OID =  860 (  char_bpchar     PGUID 11 f t f 1 f 1042 "18" 100 0 0 100  char_bpchar - ));
 DESCR("convert char to char()");
-DATA(insert OID =  861 (  bpchar_char     PGUID 11 f t f 1 f   18 "1042" 100 0 0 100  foo bar ));
+DATA(insert OID =  861 (  bpchar_char     PGUID 11 f t f 1 f   18 "1042" 100 0 0 100  bpchar_char - ));
 DESCR("convert char() to char");
 
-DATA(insert OID =  862 (  int4_mul_cash                   PGUID 11 f t f 2 f 790 "23 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  862 (  int4_mul_cash                   PGUID 11 f t f 2 f 790 "23 790" 100 0 0 100  int4_mul_cash - ));
 DESCR("multiply");
-DATA(insert OID =  863 (  int2_mul_cash                   PGUID 11 f t f 2 f 790 "21 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  863 (  int2_mul_cash                   PGUID 11 f t f 2 f 790 "21 790" 100 0 0 100  int2_mul_cash - ));
 DESCR("multiply");
-DATA(insert OID =  864 (  cash_mul_int4                   PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100  foo bar ));
+DATA(insert OID =  864 (  cash_mul_int4                   PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100  cash_mul_int4 - ));
 DESCR("multiply");
-DATA(insert OID =  865 (  cash_div_int4                   PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100  foo bar ));
+DATA(insert OID =  865 (  cash_div_int4                   PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100  cash_div_int4 - ));
 DESCR("divide");
-DATA(insert OID =  866 (  cash_mul_int2                   PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100  foo bar ));
+DATA(insert OID =  866 (  cash_mul_int2                   PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100  cash_mul_int2 - ));
 DESCR("multiply");
-DATA(insert OID =  867 (  cash_div_int2                   PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100  foo bar ));
+DATA(insert OID =  867 (  cash_div_int2                   PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100  cash_div_int2 - ));
 DESCR("divide");
 
-DATA(insert OID =  886 (  cash_in                 PGUID 11 f t f 1 f 790 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  886 (  cash_in                 PGUID 11 f t f 1 f 790 "0" 100 0 0 100  cash_in - ));
 DESCR("(internal)");
-DATA(insert OID =  887 (  cash_out                PGUID 11 f t f 1 f  23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID =  887 (  cash_out                PGUID 11 f t f 1 f  23 "0" 100 0 0 100  cash_out - ));
 DESCR("(internal)");
-DATA(insert OID =  1273 (  cash_words_out  PGUID 11 f t f 1 f  25 "790" 100 0 0 100  foo bar ));
+DATA(insert OID =  1273 (  cash_words_out  PGUID 11 f t f 1 f  25 "790" 100 0 0 100  cash_words_out - ));
 DESCR("output amount as words");
-DATA(insert OID =  888 (  cash_eq                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  888 (  cash_eq                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  cash_eq - ));
 DESCR("equal");
-DATA(insert OID =  889 (  cash_ne                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  889 (  cash_ne                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  cash_ne - ));
 DESCR("not equal");
-DATA(insert OID =  890 (  cash_lt                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  890 (  cash_lt                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  cash_lt - ));
 DESCR("less-than");
-DATA(insert OID =  891 (  cash_le                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  891 (  cash_le                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  cash_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  892 (  cash_gt                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  892 (  cash_gt                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  cash_gt - ));
 DESCR("greater-than");
-DATA(insert OID =  893 (  cash_ge                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  893 (  cash_ge                 PGUID 11 f t f 2 f  16 "790 790" 100 0 0 100  cash_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID =  894 (  cash_pl                 PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  894 (  cash_pl                 PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  cash_pl - ));
 DESCR("addition");
-DATA(insert OID =  895 (  cash_mi                 PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  895 (  cash_mi                 PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  cash_mi - ));
 DESCR("subtract");
-DATA(insert OID =  896 (  cash_mul_flt8                   PGUID 11 f t f 2 f 790 "790 701" 100 0 0 100  foo bar ));
+DATA(insert OID =  896 (  cash_mul_flt8                   PGUID 11 f t f 2 f 790 "790 701" 100 0 0 100  cash_mul_flt8 - ));
 DESCR("multiply");
-DATA(insert OID =  897 (  cash_div_flt8                   PGUID 11 f t f 2 f 790 "790 701" 100 0 0 100  foo bar ));
+DATA(insert OID =  897 (  cash_div_flt8                   PGUID 11 f t f 2 f 790 "790 701" 100 0 0 100  cash_div_flt8 - ));
 DESCR("divide");
-DATA(insert OID =  898 (  cashlarger      PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  898 (  cashlarger      PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  cashlarger - ));
 DESCR("larger of two");
-DATA(insert OID =  899 (  cashsmaller     PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  899 (  cashsmaller     PGUID 11 f t f 2 f 790 "790 790" 100 0 0 100  cashsmaller - ));
 DESCR("smaller of two");
 
-DATA(insert OID =  919 (  flt8_mul_cash                   PGUID 11 f t f 2 f 790 "701 790" 100 0 0 100  foo bar ));
+DATA(insert OID =  919 (  flt8_mul_cash                   PGUID 11 f t f 2 f 790 "701 790" 100 0 0 100  flt8_mul_cash - ));
 DESCR("multiply");
 
 /* OIDS 900 - 999 */
 
 /* isoldpath, upgradepath, upgradepoly, revertpoly are used to update pre-v6.1 to v6.1 - tgl 97/06/03 */
-DATA(insert OID = 936 (  isoldpath                PGUID 11 f t f 1 f  16 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 936 (  isoldpath                PGUID 11 f t f 1 f  16 "602" 100 0 0 100  isoldpath - ));
 DESCR("");
-DATA(insert OID = 937 (  upgradepath      PGUID 11 f t f 1 f 602 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 937 (  upgradepath      PGUID 11 f t f 1 f 602 "602" 100 0 0 100  upgradepath - ));
 DESCR("");
-DATA(insert OID = 938 (  upgradepoly      PGUID 11 f t f 1 f 604 "604" 100 0 0 100  foo bar ));
+DATA(insert OID = 938 (  upgradepoly      PGUID 11 f t f 1 f 604 "604" 100 0 0 100  upgradepoly - ));
 DESCR("");
-DATA(insert OID = 939 (  revertpoly               PGUID 11 f t f 1 f 604 "604" 100 0 0 100  foo bar ));
+DATA(insert OID = 939 (  revertpoly               PGUID 11 f t f 1 f 604 "604" 100 0 0 100  revertpoly - ));
 DESCR("");
 
-DATA(insert OID = 942 (  char_text                PGUID 11 f t f 1 f 25 "18" 100 0 0 100  foo bar ));
+DATA(insert OID = 942 (  char_text                PGUID 11 f t f 1 f 25 "18" 100 0 0 100  char_text - ));
 DESCR("convert char to text");
-DATA(insert OID = 943 (  text_char                PGUID 11 f t f 1 f 18 "25" 100 0 0 100  foo bar ));
+DATA(insert OID = 943 (  text_char                PGUID 11 f t f 1 f 18 "25" 100 0 0 100  text_char - ));
 DESCR("convert text to char");
-DATA(insert OID = 944 (  char                     PGUID 14 f t f 1 f 18 "25" 100 0 0 100  "select text_char($1)" - ));
+DATA(insert OID = 944 (  char                     PGUID 11 f t f 1 f 18 "25" 100 0 0 100  text_char - ));
 DESCR("convert text to char()");
-DATA(insert OID = 946 (  text                     PGUID 14 f t f 1 f 25 "18" 100 0 0 100  "select char_text($1)" - ));
+DATA(insert OID = 946 (  text                     PGUID 11 f t f 1 f 25 "18" 100 0 0 100  char_text - ));
 DESCR("convert char to text");
-DATA(insert OID = 947 (  char                     PGUID 14 f t f 1 f 18 "1042" 100 0 0 100  "select bpchar_char($1)" - ));
+DATA(insert OID = 947 (  char                     PGUID 11 f t f 1 f 18 "1042" 100 0 0 100  bpchar_char - ));
 DESCR("convert char() to char");
-DATA(insert OID = 948 (  varchar                  PGUID 14 f t f 1 f 25 "1043" 100 0 0 100  "select bpchar_char($1)" - ));
+DATA(insert OID = 948 (  varchar                  PGUID 11 f t f 1 f 25 "1043" 100 0 0 100  bpchar_char - ));
 DESCR("convert char to text");
 
-DATA(insert OID = 950 (  istrue                           PGUID 11 f t f 1 f 16 "16" 100 0 0 100  foo bar ));
+DATA(insert OID = 950 (  istrue                           PGUID 11 f t f 1 f 16 "16" 100 0 0 100  istrue - ));
 DESCR("");
-DATA(insert OID = 951 (  isfalse                  PGUID 11 f t f 1 f 16 "16" 100 0 0 100  foo bar ));
+DATA(insert OID = 951 (  isfalse                  PGUID 11 f t f 1 f 16 "16" 100 0 0 100  isfalse - ));
 DESCR("");
 
-DATA(insert OID = 952 (  lo_open                  PGUID 11 f t f 2 f 23 "26 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 952 (  lo_open                  PGUID 11 f t f 2 f 23 "26 23" 100 0 0 100  lo_open - ));
 DESCR("large object open");
-DATA(insert OID = 953 (  lo_close                 PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 953 (  lo_close                 PGUID 11 f t f 1 f 23 "23" 100 0 0 100  lo_close - ));
 DESCR("large object close");
-DATA(insert OID = 954 (  loread                           PGUID 11 f t f 2 f 17 "23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 954 (  loread                           PGUID 11 f t f 2 f 17 "23 23" 100 0 0 100  loread - ));
 DESCR("large object read");
-DATA(insert OID = 955 (  lowrite                  PGUID 11 f t f 2 f 23 "23 17" 100 0 0 100  foo bar ));
+DATA(insert OID = 955 (  lowrite                  PGUID 11 f t f 2 f 23 "23 17" 100 0 0 100  lowrite - ));
 DESCR("large object write");
-DATA(insert OID = 956 (  lo_lseek                 PGUID 11 f t f 3 f 23 "23 23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 956 (  lo_lseek                 PGUID 11 f t f 3 f 23 "23 23 23" 100 0 0 100  lo_lseek - ));
 DESCR("large object seek");
-DATA(insert OID = 957 (  lo_creat                 PGUID 11 f t f 1 f 26 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 957 (  lo_creat                 PGUID 11 f t f 1 f 26 "23" 100 0 0 100  lo_creat - ));
 DESCR("large object create");
-DATA(insert OID = 958 (  lo_tell                  PGUID 11 f t f 1 f 23 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 958 (  lo_tell                  PGUID 11 f t f 1 f 23 "23" 100 0 0 100  lo_tell - ));
 DESCR("large object position");
 
-DATA(insert OID = 959 (  on_pl                    PGUID 11 f t f 2 f  16 "600 628" 100 0 10 100  foo bar ));
+DATA(insert OID = 959 (  on_pl                    PGUID 11 f t f 2 f  16 "600 628" 100 0 10 100  on_pl - ));
 DESCR("contained in");
-DATA(insert OID = 960 (  on_sl                    PGUID 11 f t f 2 f  16 "601 628" 100 0 10 100  foo bar ));
+DATA(insert OID = 960 (  on_sl                    PGUID 11 f t f 2 f  16 "601 628" 100 0 10 100  on_sl - ));
 DESCR("contained in");
-DATA(insert OID = 961 (  close_pl                 PGUID 11 f t f 2 f 600 "600 628" 100 0 10 100  foo bar ));
+DATA(insert OID = 961 (  close_pl                 PGUID 11 f t f 2 f 600 "600 628" 100 0 10 100  close_pl - ));
 DESCR("closest point on line");
-DATA(insert OID = 962 (  close_sl                 PGUID 11 f t f 2 f 600 "601 628" 100 0 10 100  foo bar ));
+DATA(insert OID = 962 (  close_sl                 PGUID 11 f t f 2 f 600 "601 628" 100 0 10 100  close_sl - ));
 DESCR("closest point to line segment on line");
-DATA(insert OID = 963 (  close_lb                 PGUID 11 f t f 2 f 600 "628 603" 100 0 10 100  foo bar ));
+DATA(insert OID = 963 (  close_lb                 PGUID 11 f t f 2 f 600 "628 603" 100 0 10 100  close_lb - ));
 DESCR("closest point to line on box");
 
-DATA(insert OID = 964 (  lo_unlink                PGUID 11 f t f 1 f  23 "26" 100 0 0 100      foo bar ));
+DATA(insert OID = 964 (  lo_unlink                PGUID 11 f t f 1 f  23 "26" 100 0 0 100      lo_unlink - ));
 DESCR("large object unlink(delete)");
-DATA(insert OID = 972 (  regproctooid     PGUID 11 f t f 1 f  26 "24" 100 0 0 100      foo bar ));
+DATA(insert OID = 972 (  regproctooid     PGUID 11 f t f 1 f  26 "24" 100 0 0 100      regproctooid - ));
 DESCR("get oid for regproc");
 
-DATA(insert OID = 973 (  path_inter               PGUID 11 f t f 2 f  16 "602 602" 100 0 10 100  foo bar ));
+DATA(insert OID = 973 (  path_inter               PGUID 11 f t f 2 f  16 "602 602" 100 0 10 100  path_inter - ));
 DESCR("");
-DATA(insert OID = 975 (  box_area                 PGUID 11 f t f 1 f 701 "603" 100 0 0 100  foo bar ));
+DATA(insert OID = 975 (  box_area                 PGUID 11 f t f 1 f 701 "603" 100 0 0 100  box_area - ));
 DESCR("box area");
-DATA(insert OID = 976 (  box_width                PGUID 11 f t f 1 f 701 "603" 100 0 0 100  foo bar ));
+DATA(insert OID = 976 (  box_width                PGUID 11 f t f 1 f 701 "603" 100 0 0 100  box_width - ));
 DESCR("box width");
-DATA(insert OID = 977 (  box_height               PGUID 11 f t f 1 f 701 "603" 100 0 0 100  foo bar ));
+DATA(insert OID = 977 (  box_height               PGUID 11 f t f 1 f 701 "603" 100 0 0 100  box_height - ));
 DESCR("box height");
-DATA(insert OID = 978 (  box_distance     PGUID 11 f t f 2 f 701 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 978 (  box_distance     PGUID 11 f t f 2 f 701 "603 603" 100 0 0 100  box_distance - ));
 DESCR("distance between");
-DATA(insert OID = 980 (  box_intersect    PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100  foo bar ));
+DATA(insert OID = 980 (  box_intersect    PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100  box_intersect - ));
 DESCR("intersects");
-DATA(insert OID = 981 (  box_diagonal     PGUID 11 f t f 1 f 601 "603" 100 0 0 100  foo bar ));
+DATA(insert OID = 981 (  box_diagonal     PGUID 11 f t f 1 f 601 "603" 100 0 0 100  box_diagonal - ));
 DESCR("box diagonal");
-DATA(insert OID = 982 (  path_n_lt                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  foo bar ));
+DATA(insert OID = 982 (  path_n_lt                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  path_n_lt - ));
 DESCR("less-than");
-DATA(insert OID = 983 (  path_n_gt                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  foo bar ));
+DATA(insert OID = 983 (  path_n_gt                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  path_n_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 984 (  path_n_eq                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  foo bar ));
+DATA(insert OID = 984 (  path_n_eq                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  path_n_eq - ));
 DESCR("equal");
-DATA(insert OID = 985 (  path_n_le                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  foo bar ));
+DATA(insert OID = 985 (  path_n_le                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  path_n_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 986 (  path_n_ge                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  foo bar ));
+DATA(insert OID = 986 (  path_n_ge                PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100  path_n_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 987 (  path_length      PGUID 11 f t f 1 f 701 "602" 100 0 1 0  foo bar ));
+DATA(insert OID = 987 (  path_length      PGUID 11 f t f 1 f 701 "602" 100 0 1 0  path_length - ));
 DESCR("sum of path segments");
-DATA(insert OID = 988 (  point_ne                 PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 988 (  point_ne                 PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_ne - ));
 DESCR("not equal");
-DATA(insert OID = 989 (  point_vert               PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 989 (  point_vert               PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_vert - ));
 DESCR("is vertical");
-DATA(insert OID = 990 (  point_horiz      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 990 (  point_horiz      PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100  point_horiz - ));
 DESCR("is horizontal");
-DATA(insert OID = 991 (  point_distance    PGUID 11 f t f 2 f 701 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 991 (  point_distance    PGUID 11 f t f 2 f 701 "600 600" 100 0 0 100  point_distance - ));
 DESCR("distance between");
-DATA(insert OID = 992 (  point_slope      PGUID 11 f t f 2 f 701 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 992 (  point_slope      PGUID 11 f t f 2 f 701 "600 600" 100 0 0 100  point_slope - ));
 DESCR("slope between points");
-DATA(insert OID = 993 (  lseg_construct    PGUID 11 f t f 2 f 601 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 993 (  lseg_construct    PGUID 11 f t f 2 f 601 "600 600" 100 0 0 100  lseg_construct - ));
 DESCR("convert points to line segment");
-DATA(insert OID = 994 (  lseg_intersect    PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar ));
+DATA(insert OID = 994 (  lseg_intersect    PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 lseg_intersect - ));
 DESCR("intersects");
-DATA(insert OID = 995 (  lseg_parallel    PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 995 (  lseg_parallel    PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100  lseg_parallel - ));
 DESCR("is parallel to");
-DATA(insert OID = 996 (  lseg_perp                PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 996 (  lseg_perp                PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100  lseg_perp - ));
 DESCR("is perpendicular to");
-DATA(insert OID = 997 (  lseg_vertical    PGUID 11 f t f 1 f 16 "601" 100 0 0 100      foo bar ));
+DATA(insert OID = 997 (  lseg_vertical    PGUID 11 f t f 1 f 16 "601" 100 0 0 100      lseg_vertical - ));
 DESCR("is vertical");
-DATA(insert OID = 998 (  lseg_horizontal   PGUID 11 f t f 1 f 16 "601" 100 0 0 100     foo bar ));
+DATA(insert OID = 998 (  lseg_horizontal   PGUID 11 f t f 1 f 16 "601" 100 0 0 100     lseg_horizontal - ));
 DESCR("is horizontal");
-DATA(insert OID = 999 (  lseg_eq                  PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 999 (  lseg_eq                  PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100  lseg_eq - ));
 DESCR("equal");
 
 /* OIDS 1000 - 1999 */
 
-DATA(insert OID = 1029 (  nullvalue               PGUID 11 f t f 1 f 16 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1029 (  nullvalue               PGUID 11 f t f 1 f 16 "0" 100 0 0 100  nullvalue - ));
 DESCR("(internal)");
-DATA(insert OID = 1030 (  nonnullvalue    PGUID 11 f t f 1 f 16 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1030 (  nonnullvalue    PGUID 11 f t f 1 f 16 "0" 100 0 0 100  nonnullvalue - ));
 DESCR("(internal)");
-DATA(insert OID = 1031 (  aclitemin               PGUID 11 f t f 1 f 1033 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1031 (  aclitemin               PGUID 11 f t f 1 f 1033 "0" 100 0 0 100      aclitemin - ));
 DESCR("(internal)");
-DATA(insert OID = 1032 (  aclitemout      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1032 (  aclitemout      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  aclitemout - ));
 DESCR("(internal)");
-DATA(insert OID = 1035 (  aclinsert               PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100      foo bar ));
+DATA(insert OID = 1035 (  aclinsert               PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100      aclinsert - ));
 DESCR("addition");
-DATA(insert OID = 1036 (  aclremove               PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100      foo bar ));
+DATA(insert OID = 1036 (  aclremove               PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100      aclremove - ));
 DESCR("subtract");
-DATA(insert OID = 1037 (  aclcontains     PGUID 11 f t f 2 f 16 "1034 1033" 100 0 0 100  foo bar ));
+DATA(insert OID = 1037 (  aclcontains     PGUID 11 f t f 2 f 16 "1034 1033" 100 0 0 100  aclcontains - ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1038 (  seteval                 PGUID 11 f t f 1 f 23 "26" 100 0 0 100  foo bar ));
+DATA(insert OID = 1038 (  seteval                 PGUID 11 f t f 1 f 23 "26" 100 0 0 100  seteval - ));
 DESCR("");
-DATA(insert OID = 1044 (  bpcharin                PGUID 11 f t f 3 f 1042 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1044 (  bpcharin                PGUID 11 f t f 3 f 1042 "0" 100 0 0 100      bpcharin - ));
 DESCR("(internal)");
-DATA(insert OID = 1045 (  bpcharout               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1045 (  bpcharout               PGUID 11 f t f 1 f 23 "0" 100 0 0 100  bpcharout - ));
 DESCR("(internal)");
-DATA(insert OID = 1046 (  varcharin               PGUID 11 f t f 3 f 1043 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1046 (  varcharin               PGUID 11 f t f 3 f 1043 "0" 100 0 0 100      varcharin - ));
 DESCR("(internal)");
-DATA(insert OID = 1047 (  varcharout      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1047 (  varcharout      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  varcharout - ));
 DESCR("(internal)");
-DATA(insert OID = 1048 (  bpchareq                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1048 (  bpchareq                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  bpchareq - ));
 DESCR("equal");
-DATA(insert OID = 1049 (  bpcharlt                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1049 (  bpcharlt                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  bpcharlt - ));
 DESCR("less-than");
-DATA(insert OID = 1050 (  bpcharle                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1050 (  bpcharle                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  bpcharle - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1051 (  bpchargt                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1051 (  bpchargt                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  bpchargt - ));
 DESCR("greater-than");
-DATA(insert OID = 1052 (  bpcharge                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1052 (  bpcharge                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  bpcharge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1053 (  bpcharne                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1053 (  bpcharne                PGUID 11 f t f 2 f 16 "1042 1042" 100 0 0 100  bpcharne - ));
 DESCR("not equal");
-DATA(insert OID = 1070 (  varchareq               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1070 (  varchareq               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  varchareq - ));
 DESCR("equal");
-DATA(insert OID = 1071 (  varcharlt               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1071 (  varcharlt               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  varcharlt - ));
 DESCR("less-than");
-DATA(insert OID = 1072 (  varcharle               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1072 (  varcharle               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  varcharle - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1073 (  varchargt               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1073 (  varchargt               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  varchargt - ));
 DESCR("greater-than");
-DATA(insert OID = 1074 (  varcharge               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1074 (  varcharge               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  varcharge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1075 (  varcharne               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1075 (  varcharne               PGUID 11 f t f 2 f 16 "1043 1043" 100 0 0 100  varcharne - ));
 DESCR("not equal");
-DATA(insert OID = 1078 (  bpcharcmp               PGUID 11 f t f 2 f 23 "1042 1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1078 (  bpcharcmp               PGUID 11 f t f 2 f 23 "1042 1042" 100 0 0 100  bpcharcmp - ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1079 (  varcharcmp      PGUID 11 f t f 2 f 23 "1043 1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1079 (  varcharcmp      PGUID 11 f t f 2 f 23 "1043 1043" 100 0 0 100  varcharcmp - ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1080 (  hashbpchar      PGUID 11 f t f 1 f 23 "1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1080 (  hashbpchar      PGUID 11 f t f 1 f 23 "1042" 100 0 0 100  hashbpchar - ));
 DESCR("hash");
-DATA(insert OID = 1081 (  hashvarchar     PGUID 11 f t f 1 f 23 "1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1081 (  hashvarchar     PGUID 11 f t f 1 f 23 "1043" 100 0 0 100  hashvarchar - ));
 DESCR("hash");
 
-DATA(insert OID = 1084 (  date_in                 PGUID 11 f t f 1 f 1082 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1084 (  date_in                 PGUID 11 f t f 1 f 1082 "0" 100 0 0 100      date_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1085 (  date_out                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1085 (  date_out                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  date_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1086 (  date_eq                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1086 (  date_eq                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  date_eq - ));
 DESCR("equal");
-DATA(insert OID = 1087 (  date_lt                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1087 (  date_lt                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  date_lt - ));
 DESCR("less-than");
-DATA(insert OID = 1088 (  date_le                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1088 (  date_le                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  date_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1089 (  date_gt                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1089 (  date_gt                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  date_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 1090 (  date_ge                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1090 (  date_ge                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  date_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1091 (  date_ne                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1091 (  date_ne                 PGUID 11 f t f 2 f 16 "1082 1082" 100 0 0 100  date_ne - ));
 DESCR("not equal");
-DATA(insert OID = 1092 (  date_cmp                PGUID 11 f t f 2 f 23 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1092 (  date_cmp                PGUID 11 f t f 2 f 23 "1082 1082" 100 0 0 100  date_cmp - ));
 DESCR("less-equal-greater");
 
 /* OIDS 1100 - 1199 */
 
-DATA(insert OID = 1102 (  time_lt                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1102 (  time_lt                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  time_lt - ));
 DESCR("less-than");
-DATA(insert OID = 1103 (  time_le                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1103 (  time_le                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  time_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1104 (  time_gt                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1104 (  time_gt                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  time_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 1105 (  time_ge                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1105 (  time_ge                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  time_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1106 (  time_ne                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1106 (  time_ne                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  time_ne - ));
 DESCR("not equal");
-DATA(insert OID = 1107 (  time_cmp                PGUID 11 f t f 2 f 23 "1083 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1107 (  time_cmp                PGUID 11 f t f 2 f 23 "1083 1083" 100 0 0 100  time_cmp - ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1138 (  date_larger     PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100      foo bar ));
+DATA(insert OID = 1138 (  date_larger     PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100      date_larger - ));
 DESCR("larger of two");
-DATA(insert OID = 1139 (  date_smaller    PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100      foo bar ));
+DATA(insert OID = 1139 (  date_smaller    PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100      date_smaller - ));
 DESCR("smaller of two");
-DATA(insert OID = 1140 (  date_mi                 PGUID 11 f t f 2 f 23 "1082 1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1140 (  date_mi                 PGUID 11 f t f 2 f 23 "1082 1082" 100 0 0 100  date_mi - ));
 DESCR("subtract");
-DATA(insert OID = 1141 (  date_pli                PGUID 11 f t f 2 f 1082 "1082 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1141 (  date_pli                PGUID 11 f t f 2 f 1082 "1082 23" 100 0 0 100  date_pli - ));
 DESCR("addition");
-DATA(insert OID = 1142 (  date_mii                PGUID 11 f t f 2 f 1082 "1082 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1142 (  date_mii                PGUID 11 f t f 2 f 1082 "1082 23" 100 0 0 100  date_mii - ));
 DESCR("subtract");
-DATA(insert OID = 1143 (  time_in                 PGUID 11 f t f 1 f 1083 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1143 (  time_in                 PGUID 11 f t f 1 f 1083 "0" 100 0 0 100      time_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1144 (  time_out                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1144 (  time_out                PGUID 11 f t f 1 f 23 "0" 100 0 0 100  time_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1145 (  time_eq                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1145 (  time_eq                 PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 100  time_eq - ));
 DESCR("equal");
 
-DATA(insert OID = 1146 (  circle_add_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1146 (  circle_add_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  circle_add_pt - ));
 DESCR("addition");
-DATA(insert OID = 1147 (  circle_sub_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1147 (  circle_sub_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  circle_sub_pt - ));
 DESCR("subtract");
-DATA(insert OID = 1148 (  circle_mul_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1148 (  circle_mul_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  circle_mul_pt - ));
 DESCR("multiply");
-DATA(insert OID = 1149 (  circle_div_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1149 (  circle_div_pt    PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100  circle_div_pt - ));
 DESCR("divide");
 
-DATA(insert OID = 1150 (  datetime_in     PGUID 11 f t f 1 f 1184 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1150 (  datetime_in     PGUID 11 f t f 1 f 1184 "0" 100 0 0 100      datetime_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1151 (  datetime_out    PGUID 11 f t f 1 f   23 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1151 (  datetime_out    PGUID 11 f t f 1 f   23 "0" 100 0 0 100      datetime_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1152 (  datetime_eq     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      foo bar ));
+DATA(insert OID = 1152 (  datetime_eq     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      datetime_eq - ));
 DESCR("equal");
-DATA(insert OID = 1153 (  datetime_ne     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      foo bar ));
+DATA(insert OID = 1153 (  datetime_ne     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      datetime_ne - ));
 DESCR("not equal");
-DATA(insert OID = 1154 (  datetime_lt     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      foo bar ));
+DATA(insert OID = 1154 (  datetime_lt     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      datetime_lt - ));
 DESCR("less-than");
-DATA(insert OID = 1155 (  datetime_le     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      foo bar ));
+DATA(insert OID = 1155 (  datetime_le     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      datetime_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1156 (  datetime_ge     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      foo bar ));
+DATA(insert OID = 1156 (  datetime_ge     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      datetime_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1157 (  datetime_gt     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      foo bar ));
+DATA(insert OID = 1157 (  datetime_gt     PGUID 11 f t f 2 f   16 "1184 1184" 100 0 0 100      datetime_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 1158 (  datetime_finite  PGUID 11 f t f 1 f  16 "1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1158 (  datetime_finite  PGUID 11 f t f 1 f  16 "1184" 100 0 0 100  datetime_finite - ));
 DESCR("");
-DATA(insert OID = 1159 (  datetime_zone    PGUID 11 f t f 2 f  25 "25 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1159 (  datetime_zone    PGUID 11 f t f 2 f  25 "25 1184" 100 0 0 100  datetime_zone - ));
 DESCR("");
 
-DATA(insert OID = 1160 (  timespan_in     PGUID 11 f t f 1 f 1186 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1160 (  timespan_in     PGUID 11 f t f 1 f 1186 "0" 100 0 0 100      timespan_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1161 (  timespan_out    PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1161 (  timespan_out    PGUID 11 f t f 1 f 23 "0" 100 0 0 100  timespan_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1162 (  timespan_eq     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1162 (  timespan_eq     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  timespan_eq - ));
 DESCR("equal");
-DATA(insert OID = 1163 (  timespan_ne     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1163 (  timespan_ne     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  timespan_ne - ));
 DESCR("not equal");
-DATA(insert OID = 1164 (  timespan_lt     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1164 (  timespan_lt     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  timespan_lt - ));
 DESCR("less-than");
-DATA(insert OID = 1165 (  timespan_le     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1165 (  timespan_le     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  timespan_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1166 (  timespan_ge     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1166 (  timespan_ge     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  timespan_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1167 (  timespan_gt     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1167 (  timespan_gt     PGUID 11 f t f 2 f 16 "1186 1186" 100 0 0 100  timespan_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 1168 (  timespan_um     PGUID 11 f t f 1 f 1186 "1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1168 (  timespan_um     PGUID 11 f t f 1 f 1186 "1186" 100 0 0 100  timespan_um - ));
 DESCR("subtract");
-DATA(insert OID = 1169 (  timespan_pl    PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1169 (  timespan_pl    PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  timespan_pl - ));
 DESCR("addition");
-DATA(insert OID = 1170 (  timespan_mi    PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1170 (  timespan_mi    PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  timespan_mi - ));
 DESCR("subtract");
-DATA(insert OID = 1171 (  datetime_part    PGUID 11 f t f 2 f  701 "25 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1171 (  datetime_part    PGUID 11 f t f 2 f  701 "25 1184" 100 0 0 100  datetime_part - ));
 DESCR("extract field from datetime");
-DATA(insert OID = 1172 (  timespan_part    PGUID 11 f t f 2 f  701 "25 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1172 (  timespan_part    PGUID 11 f t f 2 f  701 "25 1186" 100 0 0 100  timespan_part - ));
 DESCR("extract field from timespan");
 
-DATA(insert OID = 1173 (  abstime_datetime      PGUID 11 f t f 1 f 1184  "702" 100 0 0 100  foo bar ));
+DATA(insert OID = 1173 (  abstime_datetime      PGUID 11 f t f 1 f 1184  "702" 100 0 0 100  abstime_datetime - ));
 DESCR("convert abstime to datetime");
-DATA(insert OID = 1174 (  date_datetime                 PGUID 11 f t f 1 f 1184 "1082" 100 0 0 100  foo bar ));
+DATA(insert OID = 1174 (  date_datetime                 PGUID 11 f t f 1 f 1184 "1082" 100 0 0 100  date_datetime - ));
 DESCR("convert date to datetime");
-DATA(insert OID = 1175 (  timestamp_datetime PGUID 11 f t f 1 f 1184 "1296" 100 0 0 100  foo bar ));
+DATA(insert OID = 1175 (  timestamp_datetime PGUID 11 f t f 1 f 1184 "1296" 100 0 0 100  timestamp_datetime - ));
 DESCR("convert timestamp to datetime");
-DATA(insert OID = 1176 (  datetime_datetime  PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100  foo bar ));
+DATA(insert OID = 1176 (  datetime_datetime  PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100  datetime_datetime - ));
 DESCR("convert date and time to datetime");
-DATA(insert OID = 1177 (  reltime_timespan      PGUID 11 f t f 1 f 1186  "703" 100 0 0 100  foo bar ));
+DATA(insert OID = 1177 (  reltime_timespan      PGUID 11 f t f 1 f 1186  "703" 100 0 0 100  reltime_timespan - ));
 DESCR("convert reltime to timespan");
-DATA(insert OID = 1178 (  datetime_date                 PGUID 11 f t f 1 f 1082 "1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1178 (  datetime_date                 PGUID 11 f t f 1 f 1082 "1184" 100 0 0 100  datetime_date - ));
 DESCR("convert datetime to date");
-DATA(insert OID = 1179 (  abstime_date          PGUID 11 f t f 1 f 1082  "702" 100 0 0 100  foo bar ));
+DATA(insert OID = 1179 (  abstime_date          PGUID 11 f t f 1 f 1082  "702" 100 0 0 100  abstime_date - ));
 DESCR("convert abstime to date");
-DATA(insert OID = 1180 (  datetime_abstime      PGUID 11 f t f 1 f  702 "1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1180 (  datetime_abstime      PGUID 11 f t f 1 f  702 "1184" 100 0 0 100  datetime_abstime - ));
 DESCR("convert datetime to abstime");
 
-DATA(insert OID = 1188 (  datetime_mi          PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1188 (  datetime_mi          PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100  datetime_mi - ));
 DESCR("subtract");
-DATA(insert OID = 1189 (  datetime_pl_span     PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1189 (  datetime_pl_span     PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100  datetime_pl_span - ));
 DESCR("plus");
-DATA(insert OID = 1190 (  datetime_mi_span     PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1190 (  datetime_mi_span     PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100  datetime_mi_span - ));
 DESCR("minus");
-DATA(insert OID = 1191 (  text_datetime                 PGUID 11 f t f 1 f 1184 "25" 100 0 0 100  foo bar ));
+DATA(insert OID = 1191 (  text_datetime                 PGUID 11 f t f 1 f 1184 "25" 100 0 0 100  text_datetime - ));
 DESCR("convert text to datetime");
-DATA(insert OID = 1192 (  datetime_text                 PGUID 11 f t f 1 f   25 "1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1192 (  datetime_text                 PGUID 11 f t f 1 f   25 "1184" 100 0 0 100  datetime_text - ));
 DESCR("convert datetime to text");
-DATA(insert OID = 1193 (  timespan_text                 PGUID 11 f t f 1 f   25 "1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1193 (  timespan_text                 PGUID 11 f t f 1 f   25 "1186" 100 0 0 100  timespan_text - ));
 DESCR("convert timespan to text");
-DATA(insert OID = 1194 (  timespan_reltime      PGUID 11 f t f 1 f  703 "1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1194 (  timespan_reltime      PGUID 11 f t f 1 f  703 "1186" 100 0 0 100  timespan_reltime - ));
 DESCR("convert timespan to reltime");
-DATA(insert OID = 1195 (  datetime_smaller      PGUID 11 f t f 2 f 1184 "1184 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1195 (  datetime_smaller      PGUID 11 f t f 2 f 1184 "1184 1184" 100 0 0 100  datetime_smaller - ));
 DESCR("smaller of two");
-DATA(insert OID = 1196 (  datetime_larger       PGUID 11 f t f 2 f 1184 "1184 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1196 (  datetime_larger       PGUID 11 f t f 2 f 1184 "1184 1184" 100 0 0 100  datetime_larger - ));
 DESCR("larger of two");
-DATA(insert OID = 1197 (  timespan_smaller      PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1197 (  timespan_smaller      PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  timespan_smaller - ));
 DESCR("smaller of two");
-DATA(insert OID = 1198 (  timespan_larger       PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1198 (  timespan_larger       PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100  timespan_larger - ));
 DESCR("larger of two");
-DATA(insert OID = 1199 (  datetime_age          PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1199 (  datetime_age          PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100  datetime_age - ));
 DESCR("date difference preserving months and years");
 
 /* OIDS 1200 - 1299 */
 
-DATA(insert OID = 1200 (  int4reltime     PGUID 11 f t f 1 f  703 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1200 (  int4reltime     PGUID 11 f t f 1 f  703 "23" 100 0 0 100  int4reltime - ));
 DESCR("convert int4 to reltime");
 
-DATA(insert OID = 1217 (  datetime_trunc   PGUID 11 f t f 2 f 1184 "25 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1217 (  datetime_trunc   PGUID 11 f t f 2 f 1184 "25 1184" 100 0 0 100  datetime_trunc - ));
 DESCR("truncate datetime to specified units");
-DATA(insert OID = 1218 (  timespan_trunc   PGUID 11 f t f 2 f 1186 "25 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1218 (  timespan_trunc   PGUID 11 f t f 2 f 1186 "25 1186" 100 0 0 100  timespan_trunc - ));
 DESCR("truncate timespan to specified units");
 
-DATA(insert OID = 1230 (  bpchar                  PGUID 14 f t f 1 f 1042 "18" 100 0 0 100  "select char_bpchar($1)" - ));
+DATA(insert OID = 1230 (  bpchar                  PGUID 11 f t f 1 f 1042 "18" 100 0 0 100  char_bpchar - ));
 DESCR("convert char to char()");
-DATA(insert OID = 1231 (  char                    PGUID 14 f t f 1 f   18 "1042" 100 0 0 100  "select bpchar_char($1)" - ));
-DESCR("convert char() to char");
 
-DATA(insert OID = 1236 (  int8larger      PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 1236 (  int8larger      PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  int8larger - ));
 DESCR("larger of two");
-DATA(insert OID = 1237 (  int8smaller     PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 1237 (  int8smaller     PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100  int8smaller - ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1238 (  texticregexeq    PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0     foo bar ));
+DATA(insert OID = 1238 (  texticregexeq    PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0     texticregexeq - ));
 DESCR("matches regex., case-insensitive");
-DATA(insert OID = 1239 (  texticregexne    PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0     foo bar ));
+DATA(insert OID = 1239 (  texticregexne    PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0     texticregexne - ));
 DESCR("does not match regex., case-insensitive");
-DATA(insert OID = 1240 (  nameicregexeq    PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
+DATA(insert OID = 1240 (  nameicregexeq    PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  nameicregexeq - ));
 DESCR("matches regex., case-insensitive");
-DATA(insert OID = 1241 (  nameicregexne    PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
+DATA(insert OID = 1241 (  nameicregexne    PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  nameicregexne - ));
 DESCR("does not match regex., case-insensitive");
 
-DATA(insert OID = 1251 (  bpcharlen               PGUID 11 f t f 1 f 23 "1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1251 (  bpcharlen               PGUID 11 f t f 1 f 23 "1042" 100 0 0 100  bpcharlen - ));
 DESCR("octet length");
-DATA(insert OID = 1378 (  bpcharoctetlen   PGUID 11 f t f 1 f 23 "1042" 100 0 0 100  foo bar ));
+DATA(insert OID = 1378 (  bpcharoctetlen   PGUID 11 f t f 1 f 23 "1042" 100 0 0 100  bpcharoctetlen - ));
 DESCR("octet length");
-DATA(insert OID = 1253 (  varcharlen      PGUID 11 f t f 1 f 23 "1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1253 (  varcharlen      PGUID 11 f t f 1 f 23 "1043" 100 0 0 100  varcharlen - ));
 DESCR("character length");
-DATA(insert OID = 1379 (  varcharoctetlen  PGUID 11 f t f 1 f 23 "1043" 100 0 0 100  foo bar ));
+DATA(insert OID = 1379 (  varcharoctetlen  PGUID 11 f t f 1 f 23 "1043" 100 0 0 100  varcharoctetlen - ));
 DESCR("octet length");
 
-DATA(insert OID = 1263 (  text_timespan    PGUID 11 f t f 1 f 1186 "25" 100 0 0 100  foo bar ));
+DATA(insert OID = 1263 (  text_timespan    PGUID 11 f t f 1 f 1186 "25" 100 0 0 100  text_timespan - ));
 DESCR("convert text to timespan");
-DATA(insert OID = 1271 (  timespan_finite  PGUID 11 f t f 1 f  16 "1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1271 (  timespan_finite  PGUID 11 f t f 1 f  16 "1186" 100 0 0 100  timespan_finite - ));
 DESCR("boolean test");
 
-DATA(insert OID = 1274 (  int84pl                 PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1274 (  int84pl                 PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  int84pl - ));
 DESCR("addition");
-DATA(insert OID = 1275 (  int84mi                 PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1275 (  int84mi                 PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  int84mi - ));
 DESCR("subtraction");
-DATA(insert OID = 1276 (  int84mul                PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1276 (  int84mul                PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  int84mul - ));
 DESCR("multiply");
-DATA(insert OID = 1277 (  int84div                PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1277 (  int84div                PGUID 11 f t f 2 f 20 "20 23" 100 0 0 100  int84div - ));
 DESCR("divide");
-DATA(insert OID = 1278 (  int48pl                 PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 1278 (  int48pl                 PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  int48pl - ));
 DESCR("addition");
-DATA(insert OID = 1279 (  int48mi                 PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 1279 (  int48mi                 PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  int48mi - ));
 DESCR("subtraction");
-DATA(insert OID = 1280 (  int48mul                PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 1280 (  int48mul                PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  int48mul - ));
 DESCR("multiply");
-DATA(insert OID = 1281 (  int48div                PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  foo bar ));
+DATA(insert OID = 1281 (  int48div                PGUID 11 f t f 2 f 20 "23 20" 100 0 0 100  int48div - ));
 DESCR("divide");
 
-DATA(insert OID = 1288 (  int8_text               PGUID 11 f t f 1 f 25 "20" 100 0 0 100  foo bar ));
+DATA(insert OID = 1288 (  int8_text               PGUID 11 f t f 1 f 25 "20" 100 0 0 100  int8_text - ));
 DESCR("convert int8 to text");
-DATA(insert OID = 1289 (  text_int8               PGUID 11 f t f 1 f 20 "25" 100 0 0 100  foo bar ));
+DATA(insert OID = 1289 (  text_int8               PGUID 11 f t f 1 f 20 "25" 100 0 0 100  text_int8 - ));
 DESCR("convert text to int8");
 
-DATA(insert OID = 1297 (  timestamp_in    PGUID 11 f t f 1 f 1296 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1297 (  timestamp_in    PGUID 11 f t f 1 f 1296 "0" 100 0 0 100      timestamp_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1298 (  timestamp_out    PGUID 11 f t f 1 f  23 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1298 (  timestamp_out    PGUID 11 f t f 1 f  23 "0" 100 0 0 100      timestamp_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1299 (  now                     PGUID 11 f t f 0 f 1296 "0" 100 0 0 100      foo bar ));
+DATA(insert OID = 1299 (  now                     PGUID 11 f t f 0 f 1296 "0" 100 0 0 100      now - ));
 DESCR("current transaction time");
 
 /* OIDS 1300 - 1399 */
 
-DATA(insert OID = 1306 (  timestampeq           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  foo bar ));
+DATA(insert OID = 1306 (  timestampeq           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  timestampeq - ));
 DESCR("equal");
-DATA(insert OID = 1307 (  timestampne           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  foo bar ));
+DATA(insert OID = 1307 (  timestampne           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  timestampne - ));
 DESCR("not equal");
-DATA(insert OID = 1308 (  timestamplt           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  foo bar ));
+DATA(insert OID = 1308 (  timestamplt           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  timestamplt - ));
 DESCR("less-than");
-DATA(insert OID = 1309 (  timestampgt           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  foo bar ));
+DATA(insert OID = 1309 (  timestampgt           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  timestampgt - ));
 DESCR("greater-than");
-DATA(insert OID = 1310 (  timestample           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  foo bar ));
+DATA(insert OID = 1310 (  timestample           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  timestample - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1311 (  timestampge           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  foo bar ));
+DATA(insert OID = 1311 (  timestampge           PGUID 11 f t f 2 f   16 "1296 1296" 100 0 0 100  timestampge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1314 (  datetime_cmp          PGUID 11 f t f 2 f   23 "1184 1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1314 (  datetime_cmp          PGUID 11 f t f 2 f   23 "1184 1184" 100 0 0 100  datetime_cmp - ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1315 (  timespan_cmp          PGUID 11 f t f 2 f   23 "1186 1186" 100 0 0 100  foo bar ));
+DATA(insert OID = 1315 (  timespan_cmp          PGUID 11 f t f 2 f   23 "1186 1186" 100 0 0 100  timespan_cmp - ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1316 (  datetime_time                 PGUID 11 f t f 1 f 1083 "1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1316 (  datetime_time                 PGUID 11 f t f 1 f 1083 "1184" 100 0 0 100  datetime_time - ));
 DESCR("convert datetime to time");
-DATA(insert OID = 1318 (  datetime_timestamp PGUID 11 f t f 1 f 1296 "1184" 100 0 0 100  foo bar ));
+DATA(insert OID = 1318 (  datetime_timestamp PGUID 11 f t f 1 f 1296 "1184" 100 0 0 100  datetime_timestamp - ));
 DESCR("convert datetime to timestamp");
-DATA(insert OID = 1326 (  timespan_div          PGUID 11 f t f 2 f 1186 "1186 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 1326 (  timespan_div          PGUID 11 f t f 2 f 1186 "1186 701" 100 0 0 100  timespan_div - ));
 DESCR("divide");
 
-DATA(insert OID = 1339 (  date_zone                     PGUID 14 f t f 2 f   25 "25 1184" 100 0 0 100  "select datetime_zone($1, $2)" - ));
+DATA(insert OID = 1339 (  date_zone                     PGUID 11 f t f 2 f   25 "25 1184" 100 0 0 100  datetime_zone - ));
 DESCR("");
-DATA(insert OID = 1340 (  text                          PGUID 14 f t f 1 f   25 "1184" 100 0 0 100  "select datetime_text($1)" - ));
+DATA(insert OID = 1340 (  text                          PGUID 11 f t f 1 f   25 "1184" 100 0 0 100  datetime_text - ));
 DESCR("convert datetime to text");
-DATA(insert OID = 1341 (  text                          PGUID 14 f t f 1 f   25 "1186" 100 0 0 100  "select timespan_text($1)" - ));
+DATA(insert OID = 1341 (  text                          PGUID 11 f t f 1 f   25 "1186" 100 0 0 100  timespan_text - ));
 DESCR("convert timespan to text");
-DATA(insert OID = 1342 (  text                          PGUID 14 f t f 1 f   25 "23" 100 0 0 100  "select int4_text($1)" - ));
+DATA(insert OID = 1342 (  text                          PGUID 11 f t f 1 f   25 "23" 100 0 0 100  int4_text - ));
 DESCR("convert int4 to text");
-DATA(insert OID = 1343 (  text                          PGUID 14 f t f 1 f   25 "21" 100 0 0 100  "select int2_text($1)" - ));
+DATA(insert OID = 1343 (  text                          PGUID 11 f t f 1 f   25 "21" 100 0 0 100  int2_text - ));
 DESCR("convert int2 to text");
-DATA(insert OID = 1344 (  text                          PGUID 14 f t f 1 f   25 "26" 100 0 0 100  "select oid_text($1)" - ));
+DATA(insert OID = 1344 (  text                          PGUID 11 f t f 1 f   25 "26" 100 0 0 100  oid_text - ));
 DESCR("convert oid to text");
-DATA(insert OID = 1345 (  oid                           PGUID 14 f t f 1 f   26 "25" 100 0 0 100  "select text_oid($1)" - ));
+DATA(insert OID = 1345 (  oid                           PGUID 11 f t f 1 f   26 "25" 100 0 0 100  text_oid - ));
 DESCR("convert text to oid");
-DATA(insert OID = 1346 (  int2                          PGUID 14 f t f 1 f   21 "25" 100 0 0 100  "select text_int2($1)" - ));
+DATA(insert OID = 1346 (  int2                          PGUID 11 f t f 1 f   21 "25" 100 0 0 100  text_int2 - ));
 DESCR("convert text to int2");
-DATA(insert OID = 1347 (  int4                          PGUID 14 f t f 1 f   23 "25" 100 0 0 100  "select text_int4($1)" - ));
+DATA(insert OID = 1347 (  int4                          PGUID 11 f t f 1 f   23 "25" 100 0 0 100  text_int4 - ));
 DESCR("convert text to int4");
 DATA(insert OID = 1348 (  obj_description       PGUID 14 f t f 1 f   25 "26" 100 0 0 100  "select description from pg_description where objoid = $1" - ));
 DESCR("get description for object id");
-DATA(insert OID = 1349 (  oid8types                     PGUID 11 f t f 1 f   25 "30" 100 0 0 100  foo bar ));
+DATA(insert OID = 1349 (  oid8types                     PGUID 11 f t f 1 f   25 "30" 100 0 0 100  oid8types - ));
 DESCR("print type names of oid8 field");
 
 DATA(insert OID = 1350 (  datetime                      PGUID 14 f t f 1 f 1184 "1184" 100 0 0 100  "select $1" - ));
 DESCR("convert (noop)");
-DATA(insert OID = 1351 (  datetime                      PGUID 14 f t f 1 f 1184 "25" 100 0 0 100  "select text_datetime($1)" - ));
+DATA(insert OID = 1351 (  datetime                      PGUID 11 f t f 1 f 1184 "25" 100 0 0 100  text_datetime - ));
 DESCR("convert text to datetime");
-DATA(insert OID = 1352 (  datetime                      PGUID 14 f t f 1 f 1184 "702" 100 0 0 100      "select abstime_datetime($1)" - ));
+DATA(insert OID = 1352 (  datetime                      PGUID 11 f t f 1 f 1184 "702" 100 0 0 100      abstime_datetime - ));
 DESCR("convert abstime to datetime");
-DATA(insert OID = 1353 (  datetime                      PGUID 14 f t f 1 f 1184 "1082" 100 0 0 100  "select date_datetime($1)" - ));
+DATA(insert OID = 1353 (  datetime                      PGUID 11 f t f 1 f 1184 "1082" 100 0 0 100  date_datetime - ));
 DESCR("convert date to datetime");
-DATA(insert OID = 1354 (  datetime                      PGUID 14 f t f 1 f 1184 "1296" 100 0 0 100  "select timestamp_datetime($1)" - ));
+DATA(insert OID = 1354 (  datetime                      PGUID 11 f t f 1 f 1184 "1296" 100 0 0 100  timestamp_datetime - ));
 DESCR("convert timestamp to datetime");
-DATA(insert OID = 1355 (  datetime                      PGUID 14 f t f 2 f 1184 "1082 1083" 100 0 0 100  "select datetime_datetime($1, $2)" - ));
+DATA(insert OID = 1355 (  datetime                      PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100  datetime_datetime - ));
 DESCR("convert date and time to datetime");
 DATA(insert OID = 1356 (  timespan                      PGUID 14 f t f 1 f 1186 "1186" 100 0 0 100  "select $1" - ));
 DESCR("convert (noop)");
-DATA(insert OID = 1357 (  timespan                      PGUID 14 f t f 1 f 1186 "703" 100 0 0 100      "select reltime_timespan($1)" - ));
+DATA(insert OID = 1357 (  timespan                      PGUID 11 f t f 1 f 1186 "703" 100 0 0 100      reltime_timespan - ));
 DESCR("convert reltime to timespan");
 DATA(insert OID = 1358 (  timespan                      PGUID 14 f t f 1 f 1186 "1083" 100 0 0 100  "select time_timespan($1)" - ));
 DESCR("convert time to timespan");
 DATA(insert OID = 1359 (  date                          PGUID 14 f t f 1 f 1082 "1082" 100 0 0 100  "select $1" - ));
 DESCR("convert (noop)");
-DATA(insert OID = 1360 (  date                          PGUID 14 f t f 1 f 1082 "1184" 100 0 0 100  "select datetime_date($1)" - ));
+DATA(insert OID = 1360 (  date                          PGUID 11 f t f 1 f 1082 "1184" 100 0 0 100  datetime_date - ));
 DESCR("convert datetime to date");
-DATA(insert OID = 1361 (  date                          PGUID 14 f t f 1 f 1082 "702" 100 0 0 100      "select abstime_date($1)" - ));
+DATA(insert OID = 1361 (  date                          PGUID 11 f t f 1 f 1082 "702" 100 0 0 100      abstime_date - ));
 DESCR("convert abstime to date");
 DATA(insert OID = 1362 (  time                          PGUID 14 f t f 1 f 1083 "1083" 100 0 0 100  "select $1" - ));
 DESCR("convert (noop)");
-DATA(insert OID = 1363 (  time                          PGUID 14 f t f 1 f 1083 "1184" 100 0 0 100  "select datetime_time($1)" - ));
+DATA(insert OID = 1363 (  time                          PGUID 11 f t f 1 f 1083 "1184" 100 0 0 100  datetime_time - ));
 DESCR("convert datetime to time");
 DATA(insert OID = 1364 (  time                          PGUID 14 f t f 1 f 1083 "702" 100 0 0 100      "select abstime_time($1)" - ));
 DESCR("convert abstime to time");
 DATA(insert OID = 1365 (  abstime                       PGUID 14 f t f 1 f  702 "702" 100 0 0 100      "select $1" - ));
 DESCR("convert (noop)");
-DATA(insert OID = 1366 (  abstime                       PGUID 14 f t f 1 f  702 "1184" 100 0 0 100  "select datetime_abstime($1)" - ));
+DATA(insert OID = 1366 (  abstime                       PGUID 11 f t f 1 f  702 "1184" 100 0 0 100  datetime_abstime - ));
 DESCR("convert datetime to abstime");
 DATA(insert OID = 1367 (  reltime                       PGUID 14 f t f 1 f  703 "703" 100 0 0 100      "select $1" - ));
 DESCR("convert (noop)");
-DATA(insert OID = 1368 (  reltime                       PGUID 14 f t f 1 f  703 "1186" 100 0 0 100  "select timespan_reltime($1)" - ));
+DATA(insert OID = 1368 (  reltime                       PGUID 11 f t f 1 f  703 "1186" 100 0 0 100  timespan_reltime - ));
 DESCR("convert timespan to reltime");
 DATA(insert OID = 1369 (  timestamp                     PGUID 14 f t f 1 f 1296 "1296" 100 0 0 100  "select $1" - ));
 DESCR("convert (noop)");
 DATA(insert OID = 1370 (  timestamp                     PGUID 14 f t f 1 f 1296 "1184" 100 0 0 100  "select datetime_stamp($1)" - ));
 DESCR("convert datetime to timestamp");
-DATA(insert OID = 1371 (  length                        PGUID 14 f t f 1 f   23   "25" 100 0 0 100  "select textlen($1)" - ));
+DATA(insert OID = 1371 (  length                        PGUID 11 f t f 1 f   23   "25" 100 0 0 100  textlen - ));
 DESCR("character length");
-DATA(insert OID = 1372 (  length                        PGUID 14 f t f 1 f   23   "1042" 100 0 0 100  "select bpcharlen($1)" - ));
+DATA(insert OID = 1372 (  length                        PGUID 11 f t f 1 f   23   "1042" 100 0 0 100  bpcharlen - ));
 DESCR("character length");
-DATA(insert OID = 1373 (  length                        PGUID 14 f t f 1 f   23   "1043" 100 0 0 100  "select varcharlen($1)" - ));
+DATA(insert OID = 1373 (  length                        PGUID 11 f t f 1 f   23   "1043" 100 0 0 100  varcharlen - ));
 DESCR("character length");
 
-DATA(insert OID = 1374 (  octet_length                  PGUID 14 f t f 1 f   23   "25" 100 0 0 100  "select textoctetlen($1)" - ));
+DATA(insert OID = 1374 (  octet_length                  PGUID 11 f t f 1 f   23   "25" 100 0 0 100  textoctetlen - ));
 DESCR("octet length");
-DATA(insert OID = 1375 (  octet_length                  PGUID 14 f t f 1 f   23   "1042" 100 0 0 100  "select bpcharoctetlen($1)" - ));
+DATA(insert OID = 1375 (  octet_length                  PGUID 11 f t f 1 f   23   "1042" 100 0 0 100  bpcharoctetlen - ));
 DESCR("octet length");
-DATA(insert OID = 1376 (  octet_length                  PGUID 14 f t f 1 f   23   "1043" 100 0 0 100  "select varcharoctetlen($1)" - ));
+DATA(insert OID = 1376 (  octet_length                  PGUID 11 f t f 1 f   23   "1043" 100 0 0 100  varcharoctetlen - ));
 DESCR("octet length");
 
-DATA(insert OID = 1380 (  date_part    PGUID 14 f t f 2 f  701 "25 1184" 100 0 0 100  "select datetime_part($1, $2)" - ));
+DATA(insert OID = 1380 (  date_part    PGUID 11 f t f 2 f  701 "25 1184" 100 0 0 100  datetime_part - ));
 DESCR("extract field from datetime");
-DATA(insert OID = 1381 (  date_part    PGUID 14 f t f 2 f  701 "25 1186" 100 0 0 100  "select timespan_part($1, $2)" - ));
+DATA(insert OID = 1381 (  date_part    PGUID 11 f t f 2 f  701 "25 1186" 100 0 0 100  timespan_part - ));
 DESCR("extract field from timespan");
 DATA(insert OID = 1382 (  date_part    PGUID 14 f t f 2 f  701 "25 702" 100 0 0 100  "select datetime_part($1, datetime($2))" - ));
 DESCR("extract field from abstime");
@@ -1678,47 +1676,47 @@ DATA(insert OID = 1384 (  date_part    PGUID 14 f t f 2 f  701 "25 1082" 100 0 0
 DESCR("extract field from date");
 DATA(insert OID = 1385 (  date_part    PGUID 14 f t f 2 f  701 "25 1083" 100 0 0 100  "select timespan_part($1, timespan($2))" - ));
 DESCR("extract field from time");
-DATA(insert OID = 1386 (  date_trunc   PGUID 14 f t f 2 f 1184 "25 1184" 100 0 0 100  "select datetime_trunc($1, $2)" - ));
+DATA(insert OID = 1386 (  date_trunc   PGUID 11 f t f 2 f 1184 "25 1184" 100 0 0 100  datetime_trunc - ));
 DESCR("truncate datetime to field");
-DATA(insert OID = 1387 (  date_trunc   PGUID 14 f t f 2 f 1186 "25 1186" 100 0 0 100  "select timespan_trunc($1, $2)" - ));
+DATA(insert OID = 1387 (  date_trunc   PGUID 11 f t f 2 f 1186 "25 1186" 100 0 0 100  timespan_trunc - ));
 DESCR("truncate timespan to field");
-DATA(insert OID = 1388 (  age             PGUID 14 f t f 2 f 1186 "1184 1184" 100 0 0 100      "select datetime_age($1, $2)" - ));
+DATA(insert OID = 1388 (  age             PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100      datetime_age - ));
 DESCR("difference between datetimes but leave years and months unresolved");
 DATA(insert OID = 1389 (  age             PGUID 14 f t f 1 f 1186 "1184" 100 0 0 100  "select datetime_age(\'today\', $1)" - ));
 DESCR("difference between datetime and today but leave years and months unresolved");
 
-DATA(insert OID = 1390 (  isfinite        PGUID 14 f t f 1 f   16 "1184" 100 0 0 100  "select datetime_finite($1)" - ));
+DATA(insert OID = 1390 (  isfinite        PGUID 11 f t f 1 f   16 "1184" 100 0 0 100  datetime_finite - ));
 DESCR("boolean test");
-DATA(insert OID = 1391 (  isfinite        PGUID 14 f t f 1 f   16 "1186" 100 0 0 100  "select timespan_finite($1)" - ));
+DATA(insert OID = 1391 (  isfinite        PGUID 11 f t f 1 f   16 "1186" 100 0 0 100  timespan_finite - ));
 DESCR("boolean test");
-DATA(insert OID = 1392 (  isfinite        PGUID 14 f t f 1 f   16 "702" 100 0 0 100  "select abstime_finite($1)" - ));
+DATA(insert OID = 1392 (  isfinite        PGUID 11 f t f 1 f   16 "702" 100 0 0 100  abstime_finite - ));
 DESCR("boolean test");
 
-DATA(insert OID = 1393 (  timespan        PGUID 14 f t f 1 f 1186 "25" 100 0 0 100  "select text_timespan($1)" - ));
+DATA(insert OID = 1393 (  timespan        PGUID 11 f t f 1 f 1186 "25" 100 0 0 100  text_timespan - ));
 DESCR("convert text to timespan");
 
-DATA(insert OID = 1394 (  name            PGUID 14 f t f 1 f   19 "25" 100 0 0 100  "select text_name($1)" - ));
+DATA(insert OID = 1394 (  name            PGUID 11 f t f 1 f   19 "25" 100 0 0 100  text_name - ));
 DESCR("convert text to name");
-DATA(insert OID = 1395 (  text            PGUID 14 f t f 1 f   25 "19" 100 0 0 100  "select name_text($1)" - ));
+DATA(insert OID = 1395 (  text            PGUID 11 f t f 1 f   25 "19" 100 0 0 100  name_text - ));
 DESCR("convert name to text");
-DATA(insert OID = 1396 (  name            PGUID 14 f t f 1 f   19 "1042" 100 0 0 100  "select bpchar_name($1)" - ));
+DATA(insert OID = 1396 (  name            PGUID 11 f t f 1 f   19 "1042" 100 0 0 100  bpchar_name - ));
 DESCR("convert char() to name");
-DATA(insert OID = 1397 (  bpchar          PGUID 14 f t f 1 f 1042 "19" 100 0 0 100  "select name_bpchar($1)" - ));
+DATA(insert OID = 1397 (  bpchar          PGUID 11 f t f 1 f 1042 "19" 100 0 0 100  name_bpchar - ));
 DESCR("convert name to char()");
-DATA(insert OID = 1398 (  name            PGUID 14 f t f 1 f   19 "1043" 100 0 0 100  "select text_name($1)" - ));
+DATA(insert OID = 1398 (  name            PGUID 11 f t f 1 f   19 "1043" 100 0 0 100  text_name - ));
 DESCR("convert varchar to name");
-DATA(insert OID = 1399 (  varchar         PGUID 14 f t f 1 f 1043 "19" 100 0 0 100  "select name_text($1)" - ));
+DATA(insert OID = 1399 (  varchar         PGUID 11 f t f 1 f 1043 "19" 100 0 0 100  name_text - ));
 DESCR("convert convert name to varchar");
 
 /* OIDS 1400 - 1499 */
 
 DATA(insert OID = 1400 (  float                   PGUID 14 f t f 1 f  701      "701" 100 0 0 100  "select $1" - ));
 DESCR("convert float8 to float8 (no-op)");
-DATA(insert OID = 1401 (  float                   PGUID 14 f t f 1 f  701      "700" 100 0 0 100  "select ftod($1)" - ));
+DATA(insert OID = 1401 (  float                   PGUID 11 f t f 1 f  701      "700" 100 0 0 100  ftod - ));
 DESCR("convert float4 to float8");
 DATA(insert OID = 1402 (  float4          PGUID 14 f t f 1 f  700      "700" 100 0 0 100  "select $1" - ));
 DESCR("convert float4 to float4 (no-op)");
-DATA(insert OID = 1403 (  float4          PGUID 14 f t f 1 f  700      "701" 100 0 0 100  "select dtof($1)" - ));
+DATA(insert OID = 1403 (  float4          PGUID 11 f t f 1 f  700      "701" 100 0 0 100  dtof - ));
 DESCR("convert float8 to float4");
 DATA(insert OID = 1404 (  int             PGUID 14 f t f 1 f   23       "23" 100 0 0 100  "select $1" - ));
 DESCR("convert (no-op)");
@@ -1726,349 +1724,349 @@ DATA(insert OID = 1405 (  int2                   PGUID 14 f t f 1 f   21       "21" 100 0 0 100  "sel
 DESCR("convert (no-op)");
 DATA(insert OID = 1406 (  float8          PGUID 14 f t f 1 f  701      "701" 100 0 0 100  "select $1" - ));
 DESCR("convert (no-op)");
-DATA(insert OID = 1407 (  float8          PGUID 14 f t f 1 f  701      "700" 100 0 0 100  "select ftod($1)" - ));
+DATA(insert OID = 1407 (  float8          PGUID 11 f t f 1 f  701      "700" 100 0 0 100  ftod - ));
 DESCR("convert float4 to float8");
-DATA(insert OID = 1408 (  float8          PGUID 14 f t f 1 f  701       "23" 100 0 0 100  "select i4tod($1)" - ));
+DATA(insert OID = 1408 (  float8          PGUID 11 f t f 1 f  701       "23" 100 0 0 100  i4tod - ));
 DESCR("convert int4 to float8");
-DATA(insert OID = 1409 (  float8          PGUID 14 f t f 1 f  701       "21" 100 0 0 100  "select i2tod($1)" - ));
+DATA(insert OID = 1409 (  float8          PGUID 11 f t f 1 f  701       "21" 100 0 0 100  i2tod - ));
 DESCR("convert int2 to float8");
-DATA(insert OID = 1410 (  float4          PGUID 14 f t f 1 f  700       "23" 100 0 0 100  "select i4tof($1)" - ));
+DATA(insert OID = 1410 (  float4          PGUID 11 f t f 1 f  700       "23" 100 0 0 100  i4tof - ));
 DESCR("convert int4 to float4");
-DATA(insert OID = 1411 (  float4          PGUID 14 f t f 1 f  700       "21" 100 0 0 100  "select i2tof($1)" - ));
+DATA(insert OID = 1411 (  float4          PGUID 11 f t f 1 f  700       "21" 100 0 0 100  i2tof - ));
 DESCR("convert int2 to float4");
 DATA(insert OID = 1412 (  int4            PGUID 14 f t f 1 f   23       "23" 100 0 0 100  "select $1" - ));
 DESCR("convert (no-op)");
-DATA(insert OID = 1413 (  int4            PGUID 14 f t f 1 f   23      "701" 100 0 0 100  "select dtoi4($1)" - ));
+DATA(insert OID = 1413 (  int4            PGUID 11 f t f 1 f   23      "701" 100 0 0 100  dtoi4 - ));
 DESCR("convert float8 to int4");
-DATA(insert OID = 1414 (  int4            PGUID 14 f t f 1 f   23       "21" 100 0 0 100  "select i2toi4($1)" - ));
+DATA(insert OID = 1414 (  int4            PGUID 11 f t f 1 f   23       "21" 100 0 0 100  i2toi4 - ));
 DESCR("convert int2 to int4");
-DATA(insert OID = 1415 (  int4            PGUID 14 f t f 1 f   23      "700" 100 0 0 100  "select ftoi4($1)" - ));
+DATA(insert OID = 1415 (  int4            PGUID 11 f t f 1 f   23      "700" 100 0 0 100  ftoi4 - ));
 DESCR("convert float4 to int4");
-DATA(insert OID = 1417 (  int2            PGUID 14 f t f 1 f   21       "23" 100 0 0 100  "select i4toi2($1)" - ));
+DATA(insert OID = 1417 (  int2            PGUID 11 f t f 1 f   21       "23" 100 0 0 100  i4toi2 - ));
 DESCR("convert int4 to int2");
-DATA(insert OID = 1418 (  int2            PGUID 14 f t f 1 f   21      "701" 100 0 0 100  "select dtoi2($1)" - ));
+DATA(insert OID = 1418 (  int2            PGUID 11 f t f 1 f   21      "701" 100 0 0 100  dtoi2 - ));
 DESCR("convert float8 to int2");
-DATA(insert OID = 1419 (  int2            PGUID 14 f t f 1 f   21      "700" 100 0 0 100  "select ftoi2($1)" - ));
+DATA(insert OID = 1419 (  int2            PGUID 11 f t f 1 f   21      "700" 100 0 0 100  ftoi2 - ));
 DESCR("convert float4 to int2");
 
-DATA(insert OID = 1421 (  box                          PGUID 11 f t f 2 f 603 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1421 (  box                          PGUID 11 f t f 2 f 603 "600 600" 100 0 0 100  box - ));
 DESCR("convert points to box");
-DATA(insert OID = 1422 (  box_add                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1422 (  box_add                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  box_add - ));
 DESCR("add point to box (translate)");
-DATA(insert OID = 1423 (  box_sub                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1423 (  box_sub                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  box_sub - ));
 DESCR("subtract point from box (translate)");
-DATA(insert OID = 1424 (  box_mul                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1424 (  box_mul                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  box_mul - ));
 DESCR("multiply box by point (scale)");
-DATA(insert OID = 1425 (  box_div                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1425 (  box_div                      PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100  box_div - ));
 DESCR("divide box by point (scale)");
-DATA(insert OID = 1426 (  path_contain_pt      PGUID 11 f t f 2 f      16 "602 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1426 (  path_contain_pt      PGUID 11 f t f 2 f      16 "602 600" 100 0 0 100  path_contain_pt - ));
 DESCR("path contains point?");
-DATA(insert OID = 1427 (  pt_contained_path PGUID 11 f t f 2 f 16 "600 602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1427 (  pt_contained_path PGUID 11 f t f 2 f 16 "600 602" 100 0 0 100  pt_contained_path - ));
 DESCR("point contained in path?");
-DATA(insert OID = 1428 (  poly_contain_pt      PGUID 11 f t f 2 f      16 "604 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1428 (  poly_contain_pt      PGUID 11 f t f 2 f      16 "604 600" 100 0 0 100  poly_contain_pt - ));
 DESCR("polygon contains point?");
-DATA(insert OID = 1429 (  pt_contained_poly PGUID 11 f t f 2 f 16 "600 604" 100 0 0 100  foo bar ));
+DATA(insert OID = 1429 (  pt_contained_poly PGUID 11 f t f 2 f 16 "600 604" 100 0 0 100  pt_contained_poly - ));
 DESCR("point contained by polygon?");
 
-DATA(insert OID = 1430 (  path_isclosed                PGUID 11 f t f 1 f      16 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1430 (  path_isclosed                PGUID 11 f t f 1 f      16 "602" 100 0 0 100  path_isclosed - ));
 DESCR("");
-DATA(insert OID = 1431 (  path_isopen          PGUID 11 f t f 1 f      16 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1431 (  path_isopen          PGUID 11 f t f 1 f      16 "602" 100 0 0 100  path_isopen - ));
 DESCR("");
-DATA(insert OID = 1432 (  path_npoints         PGUID 11 f t f 1 f      23 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1432 (  path_npoints         PGUID 11 f t f 1 f      23 "602" 100 0 0 100  path_npoints - ));
 DESCR("");
-DATA(insert OID = 1433 (  path_close           PGUID 11 f t f 1 f 602 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1433 (  path_close           PGUID 11 f t f 1 f 602 "602" 100 0 0 100  path_close - ));
 DESCR("");
-DATA(insert OID = 1434 (  path_open                    PGUID 11 f t f 1 f 602 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1434 (  path_open                    PGUID 11 f t f 1 f 602 "602" 100 0 0 100  path_open - ));
 DESCR("");
-DATA(insert OID = 1435 (  path_add                     PGUID 11 f t f 2 f 602 "602 602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1435 (  path_add                     PGUID 11 f t f 2 f 602 "602 602" 100 0 0 100  path_add - ));
 DESCR("addition");
-DATA(insert OID = 1436 (  path_add_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1436 (  path_add_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  path_add_pt - ));
 DESCR("addition");
-DATA(insert OID = 1437 (  path_sub_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1437 (  path_sub_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  path_sub_pt - ));
 DESCR("subtract");
-DATA(insert OID = 1438 (  path_mul_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1438 (  path_mul_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  path_mul_pt - ));
 DESCR("multiply");
-DATA(insert OID = 1439 (  path_div_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1439 (  path_div_pt          PGUID 11 f t f 2 f 602 "602 600" 100 0 0 100  path_div_pt - ));
 DESCR("divide");
 
-DATA(insert OID = 1440 (  point                                PGUID 11 f t f 2 f 600 "701 701" 100 0 0 100  foo bar ));
+DATA(insert OID = 1440 (  point                                PGUID 11 f t f 2 f 600 "701 701" 100 0 0 100  point - ));
 DESCR("convert x, y to point");
-DATA(insert OID = 1441 (  point_add                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1441 (  point_add                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  point_add - ));
 DESCR("add points (translate)");
-DATA(insert OID = 1442 (  point_sub                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1442 (  point_sub                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  point_sub - ));
 DESCR("subtract points (translate)");
-DATA(insert OID = 1443 (  point_mul                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1443 (  point_mul                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  point_mul - ));
 DESCR("multiply points (scale/rotate)");
-DATA(insert OID = 1444 (  point_div                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1444 (  point_div                    PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100  point_div - ));
 DESCR("divide points (scale/rotate)");
 
-DATA(insert OID = 1445 (  poly_npoints         PGUID 11 f t f 1 f      23 "604" 100 0 0 100  foo bar ));
+DATA(insert OID = 1445 (  poly_npoints         PGUID 11 f t f 1 f      23 "604" 100 0 0 100  poly_npoints - ));
 DESCR("number of points in polygon");
-DATA(insert OID = 1446 (  poly_box                     PGUID 11 f t f 1 f 603 "604" 100 0 0 100  foo bar ));
+DATA(insert OID = 1446 (  poly_box                     PGUID 11 f t f 1 f 603 "604" 100 0 0 100  poly_box - ));
 DESCR("convert polygon to bounding box");
-DATA(insert OID = 1447 (  poly_path                    PGUID 11 f t f 1 f 602 "604" 100 0 0 100  foo bar ));
+DATA(insert OID = 1447 (  poly_path                    PGUID 11 f t f 1 f 602 "604" 100 0 0 100  poly_path - ));
 DESCR("convert polygon to path");
-DATA(insert OID = 1448 (  box_poly                     PGUID 11 f t f 1 f 604 "603" 100 0 0 100  foo bar ));
+DATA(insert OID = 1448 (  box_poly                     PGUID 11 f t f 1 f 604 "603" 100 0 0 100  box_poly - ));
 DESCR("convert box to polygon");
-DATA(insert OID = 1449 (  path_poly                    PGUID 11 f t f 1 f 604 "602" 100 0 0 100  foo bar ));
+DATA(insert OID = 1449 (  path_poly                    PGUID 11 f t f 1 f 604 "602" 100 0 0 100  path_poly - ));
 DESCR("convert path to polygon");
 
-DATA(insert OID = 1450 (  circle_in                    PGUID 11 f t f 1 f 718 "0" 100 0 1 0  foo bar ));
+DATA(insert OID = 1450 (  circle_in                    PGUID 11 f t f 1 f 718 "0" 100 0 1 0  circle_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1451 (  circle_out           PGUID 11 f t f 1 f      23      "0" 100 0 1 0  foo bar ));
+DATA(insert OID = 1451 (  circle_out           PGUID 11 f t f 1 f      23      "0" 100 0 1 0  circle_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1452 (  circle_same          PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1452 (  circle_same          PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_same - ));
 DESCR("same as");
-DATA(insert OID = 1453 (  circle_contain       PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1453 (  circle_contain       PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_contain - ));
 DESCR("contains");
-DATA(insert OID = 1454 (  circle_left          PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1454 (  circle_left          PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_left - ));
 DESCR("is left of");
-DATA(insert OID = 1455 (  circle_overleft      PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1455 (  circle_overleft      PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_overleft - ));
 DESCR("overlaps, but does not extend to right of");
-DATA(insert OID = 1456 (  circle_overright     PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1456 (  circle_overright     PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_overright - ));
 DESCR("");
-DATA(insert OID = 1457 (  circle_right         PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1457 (  circle_right         PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_right - ));
 DESCR("is left of");
-DATA(insert OID = 1458 (  circle_contained     PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1458 (  circle_contained     PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_contained - ));
 DESCR("");
-DATA(insert OID = 1459 (  circle_overlap       PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1459 (  circle_overlap       PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_overlap - ));
 DESCR("overlaps");
-DATA(insert OID = 1460 (  circle_below         PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1460 (  circle_below         PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_below - ));
 DESCR("is below");
-DATA(insert OID = 1461 (  circle_above         PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1461 (  circle_above         PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_above - ));
 DESCR("is above");
-DATA(insert OID = 1462 (  circle_eq                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1462 (  circle_eq                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_eq - ));
 DESCR("equal");
-DATA(insert OID = 1463 (  circle_ne                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1463 (  circle_ne                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_ne - ));
 DESCR("not equal");
-DATA(insert OID = 1464 (  circle_lt                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1464 (  circle_lt                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_lt - ));
 DESCR("less-than");
-DATA(insert OID = 1465 (  circle_gt                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1465 (  circle_gt                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 1466 (  circle_le                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1466 (  circle_le                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1467 (  circle_ge                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1467 (  circle_ge                    PGUID 11 f t f 2 f      16 "718 718" 100 0 1 0  circle_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1468 (  circle_area          PGUID 11 f t f 1 f 701 "718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1468 (  circle_area          PGUID 11 f t f 1 f 701 "718" 100 0 1 0  circle_area - ));
 DESCR("area");
-DATA(insert OID = 1469 (  circle_diameter      PGUID 11 f t f 1 f 701 "718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1469 (  circle_diameter      PGUID 11 f t f 1 f 701 "718" 100 0 1 0  circle_diameter - ));
 DESCR("diameter");
-DATA(insert OID = 1470 (  circle_radius                PGUID 11 f t f 1 f 701 "718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1470 (  circle_radius                PGUID 11 f t f 1 f 701 "718" 100 0 1 0  circle_radius - ));
 DESCR("radius");
-DATA(insert OID = 1471 (  circle_distance      PGUID 11 f t f 2 f 701 "718 718" 100 0 1 0      foo bar ));
+DATA(insert OID = 1471 (  circle_distance      PGUID 11 f t f 2 f 701 "718 718" 100 0 1 0      circle_distance - ));
 DESCR("distance between");
-DATA(insert OID = 1472 (  circle_center                PGUID 11 f t f 1 f 600 "718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1472 (  circle_center                PGUID 11 f t f 1 f 600 "718" 100 0 1 0  circle_center - ));
 DESCR("center of");
-DATA(insert OID = 1473 (  circle                       PGUID 11 f t f 2 f 718 "600 701" 100 0 1 0      foo bar ));
+DATA(insert OID = 1473 (  circle                       PGUID 11 f t f 2 f 718 "600 701" 100 0 1 0      circle - ));
 DESCR("convert point and radius to circle");
-DATA(insert OID = 1474 (  poly_circle          PGUID 11 f t f 1 f 718 "604" 100 0 1 0  foo bar ));
+DATA(insert OID = 1474 (  poly_circle          PGUID 11 f t f 1 f 718 "604" 100 0 1 0  poly_circle - ));
 DESCR("convert polygon to circle");
-DATA(insert OID = 1475 (  circle_poly          PGUID 11 f t f 2 f 604 "23 718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1475 (  circle_poly          PGUID 11 f t f 2 f 604 "23 718" 100 0 1 0  circle_poly - ));
 DESCR("convert vertex count and circle to polygon");
-DATA(insert OID = 1476 (  dist_pc                      PGUID 11 f t f 2 f 701 "600 718" 100 0 1 0      foo bar ));
+DATA(insert OID = 1476 (  dist_pc                      PGUID 11 f t f 2 f 701 "600 718" 100 0 1 0      dist_pc - ));
 DESCR("distance between");
-DATA(insert OID = 1477 (  circle_contain_pt   PGUID 11 f t f 2 f  16 "718 600" 100 0 0 100     foo bar ));
+DATA(insert OID = 1477 (  circle_contain_pt   PGUID 11 f t f 2 f  16 "718 600" 100 0 0 100     circle_contain_pt - ));
 DESCR("");
-DATA(insert OID = 1478 (  pt_contained_circle PGUID 11 f t f 2 f  16 "600 718" 100 0 0 100     foo bar ));
+DATA(insert OID = 1478 (  pt_contained_circle PGUID 11 f t f 2 f  16 "600 718" 100 0 0 100     pt_contained_circle - ));
 DESCR("");
-DATA(insert OID = 1479 (  box_circle           PGUID 11 f t f 1 f 718 "603" 100 0 1 0  foo bar ));
+DATA(insert OID = 1479 (  box_circle           PGUID 11 f t f 1 f 718 "603" 100 0 1 0  box_circle - ));
 DESCR("convert box to circle");
-DATA(insert OID = 1480 (  circle_box           PGUID 11 f t f 1 f 603 "718" 100 0 1 0  foo bar ));
+DATA(insert OID = 1480 (  circle_box           PGUID 11 f t f 1 f 603 "718" 100 0 1 0  circle_box - ));
 DESCR("convert circle to box");
 
-DATA(insert OID = 1481 (  text_substr          PGUID 11 f t f 3 f 25 "25 23 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1481 (  text_substr          PGUID 11 f t f 3 f 25 "25 23 23" 100 0 0 100  text_substr - ));
 DESCR("return portion of string");
 
-DATA(insert OID = 1482 (  lseg_ne                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 1482 (  lseg_ne                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  lseg_ne - ));
 DESCR("not equal");
-DATA(insert OID = 1483 (  lseg_lt                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 1483 (  lseg_lt                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  lseg_lt - ));
 DESCR("less-than");
-DATA(insert OID = 1484 (  lseg_le                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 1484 (  lseg_le                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  lseg_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1485 (  lseg_gt                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 1485 (  lseg_gt                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  lseg_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 1486 (  lseg_ge                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  foo bar ));
+DATA(insert OID = 1486 (  lseg_ge                      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  lseg_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1487 (  lseg_length          PGUID 11 f t f 1 f 701 "601" 100 0 1 0  foo bar ));
+DATA(insert OID = 1487 (  lseg_length          PGUID 11 f t f 1 f 701 "601" 100 0 1 0  lseg_length - ));
 DESCR("distance between endpoints");
-DATA(insert OID = 1488 (  close_ls                     PGUID 11 f t f 2 f 600 "628 601" 100 0 10 100  foo bar ));
+DATA(insert OID = 1488 (  close_ls                     PGUID 11 f t f 2 f 600 "628 601" 100 0 10 100  close_ls - ));
 DESCR("closest point to line on line segment");
-DATA(insert OID = 1489 (  close_lseg           PGUID 11 f t f 2 f 600 "601 601" 100 0 10 100  foo bar ));
+DATA(insert OID = 1489 (  close_lseg           PGUID 11 f t f 2 f 600 "601 601" 100 0 10 100  close_lseg - ));
 DESCR("closest point to line segment on line segment");
 
-DATA(insert OID = 1490 (  line_in                      PGUID 11 f t f 1 f 628 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1490 (  line_in                      PGUID 11 f t f 1 f 628 "0" 100 0 0 100  line_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1491 (  line_out                     PGUID 11 f t f 1 f 23  "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1491 (  line_out                     PGUID 11 f t f 1 f 23  "0" 100 0 0 100  line_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1492 (  line_eq                      PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 1492 (  line_eq                      PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  line_eq - ));
 DESCR("lines equal?");
-DATA(insert OID = 1493 (  line_construct_pp PGUID 11 f t f 2 f 628 "600 600" 100 0 0 100  foo bar ));
+DATA(insert OID = 1493 (  line_construct_pp PGUID 11 f t f 2 f 628 "600 600" 100 0 0 100  line_construct_pp - ));
 DESCR("line from points");
-DATA(insert OID = 1494 (  line_interpt         PGUID 11 f t f 2 f 600 "628 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 1494 (  line_interpt         PGUID 11 f t f 2 f 600 "628 628" 100 0 0 100  line_interpt - ));
 DESCR("intersection point");
-DATA(insert OID = 1495 (  line_intersect       PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 1495 (  line_intersect       PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  line_intersect - ));
 DESCR("lines intersect?");
-DATA(insert OID = 1496 (  line_parallel                PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 1496 (  line_parallel                PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  line_parallel - ));
 DESCR("lines parallel?");
-DATA(insert OID = 1497 (  line_perp                    PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  foo bar ));
+DATA(insert OID = 1497 (  line_perp                    PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  line_perp - ));
 DESCR("lines perpendicular?");
-DATA(insert OID = 1498 (  line_vertical                PGUID 11 f t f 1 f      16 "628" 100 0 0 100  foo bar ));
+DATA(insert OID = 1498 (  line_vertical                PGUID 11 f t f 1 f      16 "628" 100 0 0 100  line_vertical - ));
 DESCR("lines vertical?");
-DATA(insert OID = 1499 (  line_horizontal      PGUID 11 f t f 1 f      16 "628" 100 0 0 100  foo bar ));
+DATA(insert OID = 1499 (  line_horizontal      PGUID 11 f t f 1 f      16 "628" 100 0 0 100  line_horizontal - ));
 DESCR("lines horizontal?");
 
 /* OIDS 1500 - 1599 */
 
-DATA(insert OID = 1530 (  point                                PGUID 14 f t f 2 f 600 "601 601" 100 0 0 100  "select lseg_interpt($1, $2)" - ));
+DATA(insert OID = 1530 (  point                                PGUID 11 f t f 2 f 600 "601 601" 100 0 0 100  lseg_interpt - ));
 DESCR("convert two line segments to point (intersection)");
-DATA(insert OID = 1531 (  point                                PGUID 14 f t f 1 f 600 "718" 100 0 0 100  "select circle_center($1)" - ));
+DATA(insert OID = 1531 (  point                                PGUID 11 f t f 1 f 600 "718" 100 0 0 100  circle_center - ));
 DESCR("convert circle to point (center)");
-DATA(insert OID = 1532 (  isvertical           PGUID 14 f t f 2 f      16 "600 600" 100 0 0 100  "select point_vert($1, $2)" - ));
+DATA(insert OID = 1532 (  isvertical           PGUID 11 f t f 2 f      16 "600 600" 100 0 0 100  point_vert - ));
 DESCR("");
-DATA(insert OID = 1533 (  ishorizontal         PGUID 14 f t f 2 f      16 "600 600" 100 0 0 100  "select point_horiz($1, $2)" - ));
+DATA(insert OID = 1533 (  ishorizontal         PGUID 11 f t f 2 f      16 "600 600" 100 0 0 100  point_horiz - ));
 DESCR("");
-DATA(insert OID = 1534 (  slope                                PGUID 14 f t f 2 f 701 "600 600" 100 0 0 100  "select point_slope($1, $2)" - ));
+DATA(insert OID = 1534 (  slope                                PGUID 11 f t f 2 f 701 "600 600" 100 0 0 100  point_slope - ));
 DESCR("");
 
-DATA(insert OID = 1540 (  lseg                         PGUID 14 f t f 2 f 601 "600 600" 100 0 0 100  "select lseg_construct($1, $2)" - ));
+DATA(insert OID = 1540 (  lseg                         PGUID 11 f t f 2 f 601 "600 600" 100 0 0 100  lseg_construct - ));
 DESCR("");
-DATA(insert OID = 1541 (  lseg                         PGUID 14 f t f 1 f 601 "603" 100 0 0 100  "select box_diagonal($1)" - ));
+DATA(insert OID = 1541 (  lseg                         PGUID 11 f t f 1 f 601 "603" 100 0 0 100  box_diagonal - ));
 DESCR("");
-DATA(insert OID = 1542 (  isparallel           PGUID 14 f t f 2 f      16 "601 601" 100 0 0 100  "select lseg_parallel($1, $2)" - ));
+DATA(insert OID = 1542 (  isparallel           PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  lseg_parallel - ));
 DESCR("");
-DATA(insert OID = 1543 (  isperpendicular      PGUID 14 f t f 2 f      16 "601 601" 100 0 0 100  "select lseg_perp($1, $2)" - ));
+DATA(insert OID = 1543 (  isperpendicular      PGUID 11 f t f 2 f      16 "601 601" 100 0 0 100  lseg_perp - ));
 DESCR("");
-DATA(insert OID = 1544 (  isvertical           PGUID 14 f t f 1 f      16 "601" 100 0 0 100  "select lseg_vertical($1)" - ));
+DATA(insert OID = 1544 (  isvertical           PGUID 11 f t f 1 f      16 "601" 100 0 0 100  lseg_vertical - ));
 DESCR("");
-DATA(insert OID = 1545 (  ishorizontal         PGUID 14 f t f 1 f      16 "601" 100 0 0 100  "select lseg_horizontal($1)" - ));
+DATA(insert OID = 1545 (  ishorizontal         PGUID 11 f t f 1 f      16 "601" 100 0 0 100  lseg_horizontal - ));
 DESCR("");
 
 /* pclose and popen might better be named close and open, but that crashes initdb.
  * - tgl 97/04/20
  */
 
-DATA(insert OID = 1550 (  path                         PGUID 14 f t f 1 f 602 "604" 100 0 0 100  "select poly_path($1)" - ));
+DATA(insert OID = 1550 (  path                         PGUID 11 f t f 1 f 602 "604" 100 0 0 100  poly_path - ));
 DESCR("");
-DATA(insert OID = 1551 (  length                       PGUID 14 f t f 1 f 701 "602" 100 0 1 0  "select path_length($1)" - ));
+DATA(insert OID = 1551 (  length                       PGUID 11 f t f 1 f 701 "602" 100 0 1 0  path_length - ));
 DESCR("sum of lengths of path segments");
-DATA(insert OID = 1552 (  points                       PGUID 14 f t f 1 f      23 "602" 100 0 0 100  "select path_npoints($1)" - ));
+DATA(insert OID = 1552 (  points                       PGUID 11 f t f 1 f      23 "602" 100 0 0 100  path_npoints - ));
 DESCR("");
-DATA(insert OID = 1553 (  pclose                       PGUID 14 f t f 1 f 602 "602" 100 0 0 100  "select path_close($1)" - ));
+DATA(insert OID = 1553 (  pclose                       PGUID 11 f t f 1 f 602 "602" 100 0 0 100  path_close - ));
 DESCR("");
-DATA(insert OID = 1554 (  popen                                PGUID 14 f t f 1 f 602 "602" 100 0 0 100  "select path_open($1)" - ));
+DATA(insert OID = 1554 (  popen                                PGUID 11 f t f 1 f 602 "602" 100 0 0 100  path_open - ));
 DESCR("");
-DATA(insert OID = 1555 (  isopen                       PGUID 14 f t f 1 f      16 "602" 100 0 0 100  "select path_isopen($1)" - ));
+DATA(insert OID = 1555 (  isopen                       PGUID 11 f t f 1 f      16 "602" 100 0 0 100  path_isopen - ));
 DESCR("");
-DATA(insert OID = 1556 (  isclosed                     PGUID 14 f t f 1 f      16 "602" 100 0 0 100  "select path_isclosed($1)" - ));
+DATA(insert OID = 1556 (  isclosed                     PGUID 11 f t f 1 f      16 "602" 100 0 0 100  path_isclosed - ));
 DESCR("");
 
-DATA(insert OID = 1560 (  box                          PGUID 14 f t f 2 f 603 "603 603" 100 0 0 100  "select box_intersect($1, $2)" - ));
+DATA(insert OID = 1560 (  box                          PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100  box_intersect - ));
 DESCR("convert boxes to box (intersection)");
-DATA(insert OID = 1561 (  box                          PGUID 14 f t f 1 f 603 "604" 100 0 0 100  "select poly_box($1)" - ));
+DATA(insert OID = 1561 (  box                          PGUID 11 f t f 1 f 603 "604" 100 0 0 100  poly_box - ));
 DESCR("convert polygon to box");
-DATA(insert OID = 1562 (  width                                PGUID 14 f t f 1 f 701 "603" 100 0 0 100  "select box_width($1)" - ));
+DATA(insert OID = 1562 (  width                                PGUID 11 f t f 1 f 701 "603" 100 0 0 100  box_width - ));
 DESCR("box width");
-DATA(insert OID = 1563 (  height                       PGUID 14 f t f 1 f 701 "603" 100 0 0 100  "select box_height($1)" - ));
+DATA(insert OID = 1563 (  height                       PGUID 11 f t f 1 f 701 "603" 100 0 0 100  box_height - ));
 DESCR("box height");
-DATA(insert OID = 1564 (  center                       PGUID 14 f t f 1 f 600 "603" 100 0 0 100  "select box_center($1)" - ));
+DATA(insert OID = 1564 (  center                       PGUID 11 f t f 1 f 600 "603" 100 0 0 100  box_center - ));
 DESCR("box center");
-DATA(insert OID = 1565 (  area                         PGUID 14 f t f 1 f 701 "603" 100 0 0 100  "select box_area($1)" - ));
+DATA(insert OID = 1565 (  area                         PGUID 11 f t f 1 f 701 "603" 100 0 0 100  box_area - ));
 DESCR("box area");
-DATA(insert OID = 1569 (  box                          PGUID 14 f t f 1 f 603 "718" 100 0 0 100  "select circle_box($1)" - ));
+DATA(insert OID = 1569 (  box                          PGUID 11 f t f 1 f 603 "718" 100 0 0 100  circle_box - ));
 DESCR("convert circle to box");
 
-DATA(insert OID = 1570 (  polygon                      PGUID 14 f t f 1 f 604 "602" 100 0 0 100  "select path_poly($1)" - ));
+DATA(insert OID = 1570 (  polygon                      PGUID 11 f t f 1 f 604 "602" 100 0 0 100  path_poly - ));
 DESCR("convert path to polygon");
-DATA(insert OID = 1571 (  polygon                      PGUID 14 f t f 1 f 604 "603" 100 0 0 100  "select box_poly($1)" - ));
+DATA(insert OID = 1571 (  polygon                      PGUID 11 f t f 1 f 604 "603" 100 0 0 100  box_poly - ));
 DESCR("convert box to polygon");
-DATA(insert OID = 1572 (  polygon                      PGUID 14 f t f 2 f 604 "23 718" 100 0 0 100  "select circle_poly($1, $2)" - ));
+DATA(insert OID = 1572 (  polygon                      PGUID 11 f t f 2 f 604 "23 718" 100 0 0 100  circle_poly - ));
 DESCR("convert circle to polygon");
 DATA(insert OID = 1573 (  polygon                      PGUID 14 f t f 1 f 604 "718" 100 0 0 100  "select circle_poly(12, $1)" - ));
 DESCR("convert circle to 12-vertex polygon");
-DATA(insert OID = 1574 (  points                       PGUID 14 f t f 1 f      23 "604" 100 0 0 100  "select poly_npoints($1)" - ));
+DATA(insert OID = 1574 (  points                       PGUID 11 f t f 1 f      23 "604" 100 0 0 100  poly_npoints - ));
 DESCR("");
-DATA(insert OID = 1575 (  center                       PGUID 14 f t f 1 f 600 "604" 100 0 0 100  "select poly_center($1)" - ));
+DATA(insert OID = 1575 (  center                       PGUID 11 f t f 1 f 600 "604" 100 0 0 100  poly_center - ));
 DESCR("");
-DATA(insert OID = 1576 (  length                       PGUID 14 f t f 1 f 701 "601" 100 0 1 0  "select lseg_length($1)" - ));
+DATA(insert OID = 1576 (  length                       PGUID 11 f t f 1 f 701 "601" 100 0 1 0  lseg_length - ));
 DESCR("distance between endpoints");
 
-DATA(insert OID = 1579 (  circle                       PGUID 14 f t f 1 f 718 "603" 100 0 0 100  "select box_circle($1)" - ));
+DATA(insert OID = 1579 (  circle                       PGUID 11 f t f 1 f 718 "603" 100 0 0 100  box_circle - ));
 DESCR("convert box to circle");
-DATA(insert OID = 1580 (  circle                       PGUID 14 f t f 1 f 718 "604" 100 0 0 100  "select poly_circle($1)" - ));
+DATA(insert OID = 1580 (  circle                       PGUID 11 f t f 1 f 718 "604" 100 0 0 100  poly_circle - ));
 DESCR("convert polygon to circle");
-DATA(insert OID = 1581 (  center                       PGUID 14 f t f 1 f 600 "718" 100 0 0 100  "select circle_center($1)" - ));
+DATA(insert OID = 1581 (  center                       PGUID 11 f t f 1 f 600 "718" 100 0 0 100  circle_center - ));
 DESCR("center of circle");
-DATA(insert OID = 1582 (  radius                       PGUID 14 f t f 1 f 701 "718" 100 0 0 100  "select circle_radius($1)" - ));
+DATA(insert OID = 1582 (  radius                       PGUID 11 f t f 1 f 701 "718" 100 0 0 100  circle_radius - ));
 DESCR("radius of circle");
-DATA(insert OID = 1583 (  diameter                     PGUID 14 f t f 1 f 701 "718" 100 0 0 100  "select circle_diameter($1)" - ));
+DATA(insert OID = 1583 (  diameter                     PGUID 11 f t f 1 f 701 "718" 100 0 0 100  circle_diameter - ));
 DESCR("diameter of circle");
-DATA(insert OID = 1584 (  area                         PGUID 14 f t f 1 f 701 "718" 100 0 0 100  "select circle_area($1)" - ));
+DATA(insert OID = 1584 (  area                         PGUID 11 f t f 1 f 701 "718" 100 0 0 100  circle_area - ));
 DESCR("area of circle");
 
 DATA(insert OID = 1592 (  int8                         PGUID 14 f t f 1 f      20 "20" 100 0 0 100  "select $1" - ));
 DESCR("convert int8 to int8 (no-op)");
-DATA(insert OID = 1593 (  int8                         PGUID 14 f t f 1 f      20 "23" 100 0 0 100  "select int48($1)" - ));
+DATA(insert OID = 1593 (  int8                         PGUID 11 f t f 1 f      20 "23" 100 0 0 100  int48 - ));
 DESCR("convert int4 to int8");
-DATA(insert OID = 1594 (  int8                         PGUID 14 f t f 1 f      20 "701" 100 0 0 100  "select dtoi8($1)" - ));
+DATA(insert OID = 1594 (  int8                         PGUID 11 f t f 1 f      20 "701" 100 0 0 100  dtoi8 - ));
 DESCR("convert float8 to int8");
-DATA(insert OID = 1595 (  int4                         PGUID 14 f t f 1 f      23 "20" 100 0 0 100  "select int84($1)" - ));
+DATA(insert OID = 1595 (  int4                         PGUID 11 f t f 1 f      23 "20" 100 0 0 100  int84 - ));
 DESCR("convert int8 to int4");
-DATA(insert OID = 1596 (  float8                       PGUID 14 f t f 1 f 701 "20" 100 0 0 100  "select i8tod($1)" - ));
+DATA(insert OID = 1596 (  float8                       PGUID 11 f t f 1 f 701 "20" 100 0 0 100  i8tod - ));
 DESCR("convert int8 to float8");
 
 /* OIDS 1600 - 1699 */
 
-DATA(insert OID = 1600 (  line                         PGUID 14 f t f 2 f 628 "600 600" 100 0 0 100  "select line_construct_pp($1, $2)" - ));
+DATA(insert OID = 1600 (  line                         PGUID 11 f t f 2 f 628 "600 600" 100 0 0 100  line_construct_pp - ));
 DESCR("points to line");
-DATA(insert OID = 1601 (  ishorizontal         PGUID 14 f t f 1 f      16 "628" 100 0 0 100  "select line_horizontal($1)" - ));
+DATA(insert OID = 1601 (  ishorizontal         PGUID 11 f t f 1 f      16 "628" 100 0 0 100  line_horizontal - ));
 DESCR("is line horizontal?");
-DATA(insert OID = 1602 (  isvertical           PGUID 14 f t f 1 f      16 "628" 100 0 0 100  "select line_vertical($1)" - ));
+DATA(insert OID = 1602 (  isvertical           PGUID 11 f t f 1 f      16 "628" 100 0 0 100  line_vertical - ));
 DESCR("is line vertical?");
-DATA(insert OID = 1603 (  isparallel           PGUID 14 f t f 2 f      16 "628 628" 100 0 0 100  "select line_parallel($1, $2)" - ));
+DATA(insert OID = 1603 (  isparallel           PGUID 11 f t f 2 f      16 "628 628" 100 0 0 100  line_parallel - ));
 DESCR("are lines parallel?");
 
-DATA(insert OID = 1604 (  float8          PGUID 14 f t f 1 f 701 "25" 100 0 0 100  "select text_float8($1)" - ));
+DATA(insert OID = 1604 (  float8          PGUID 11 f t f 1 f 701 "25" 100 0 0 100  text_float8 - ));
 DESCR("convert text to float8");
-DATA(insert OID = 1605 (  float4          PGUID 14 f t f 1 f 700 "25" 100 0 0 100  "select text_float4($1)" - ));
+DATA(insert OID = 1605 (  float4          PGUID 11 f t f 1 f 700 "25" 100 0 0 100  text_float4 - ));
 DESCR("convert text to float4");
-DATA(insert OID = 1606 (  text            PGUID 14 f t f 1 f  25 "701" 100 0 0 100  "select float8_text($1)" - ));
+DATA(insert OID = 1606 (  text            PGUID 11 f t f 1 f  25 "701" 100 0 0 100  float8_text - ));
 DESCR("convert float8 to text");
-DATA(insert OID = 1607 (  text            PGUID 14 f t f 1 f  25 "700" 100 0 0 100  "select float4_text($1)" - ));
+DATA(insert OID = 1607 (  text            PGUID 11 f t f 1 f  25 "700" 100 0 0 100  float4_text - ));
 DESCR("convert float4 to text");
 
-DATA(insert OID = 1619 (  varchar         PGUID 14 f t f 1 f 1043 "23" 100 0 0 100  "select int4_text($1)" - ));
+DATA(insert OID = 1619 (  varchar         PGUID 11 f t f 1 f 1043 "23" 100 0 0 100  int4_text - ));
 DESCR("convert int4 to varchar");
-DATA(insert OID = 1620 (  int4            PGUID 14 f t f 1 f   23 "1043" 100 0 0 100  "select text_int4($1)" - ));
+DATA(insert OID = 1620 (  int4            PGUID 11 f t f 1 f   23 "1043" 100 0 0 100  text_int4 - ));
 DESCR("convert varchar to int4");
-DATA(insert OID = 1621 (  text            PGUID 14 f t f 1 f  25 "20" 100 0 0 100  "select int8_text($1)" - ));
+DATA(insert OID = 1621 (  text            PGUID 11 f t f 1 f  25 "20" 100 0 0 100  int8_text - ));
 DESCR("convert int8 to text");
-DATA(insert OID = 1622 (  int8            PGUID 14 f t f 1 f  20 "25" 100 0 0 100  "select text_int8($1)" - ));
+DATA(insert OID = 1622 (  int8            PGUID 11 f t f 1 f  20 "25" 100 0 0 100  text_int8 - ));
 DESCR("convert text to int8");
-DATA(insert OID = 1623 (  varchar         PGUID 14 f t f 1 f 1043 "20" 100 0 0 100  "select int8_text($1)" - ));
+DATA(insert OID = 1623 (  varchar         PGUID 11 f t f 1 f 1043 "20" 100 0 0 100  int8_text - ));
 DESCR("convert int8 to varchar");
-DATA(insert OID = 1624 (  int8            PGUID 14 f t f 1 f  20 "1043" 100 0 0 100  "select text_int8($1)" - ));
+DATA(insert OID = 1624 (  int8            PGUID 11 f t f 1 f  20 "1043" 100 0 0 100  text_int8 - ));
 DESCR("convert varchar to int8");
 
 /* Oracle Compatibility Related Functions - By Edmund Mergl <E.Mergl@bawue.de> */
-DATA(insert OID =  868 (  strpos          PGUID 14 f t f 2 f 23 "25 25" 100 0 0 100  "select textpos($1, $2)" - ));
+DATA(insert OID =  868 (  strpos          PGUID 11 f t f 2 f 23 "25 25" 100 0 0 100  textpos - ));
 DESCR("find position of substring");
-DATA(insert OID =  870 (  lower                   PGUID 11 f t f 1 f 25 "25" 100 0 0 100  foo bar ));
+DATA(insert OID =  870 (  lower                   PGUID 11 f t f 1 f 25 "25" 100 0 0 100  lower - ));
 DESCR("lowercase");
-DATA(insert OID =  871 (  upper                   PGUID 11 f t f 1 f 25 "25" 100 0 0 100  foo bar ));
+DATA(insert OID =  871 (  upper                   PGUID 11 f t f 1 f 25 "25" 100 0 0 100  upper - ));
 DESCR("uppercase");
-DATA(insert OID =  872 (  initcap         PGUID 11 f t f 1 f 25 "25" 100 0 0 100  foo bar ));
+DATA(insert OID =  872 (  initcap         PGUID 11 f t f 1 f 25 "25" 100 0 0 100  initcap - ));
 DESCR("capitalize each word");
-DATA(insert OID =  873 (  lpad            PGUID 11 f t f 3 f 25 "25 23 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  873 (  lpad            PGUID 11 f t f 3 f 25 "25 23 25" 100 0 0 100  lpad - ));
 DESCR("left-pad string to length");
-DATA(insert OID =  874 (  rpad            PGUID 11 f t f 3 f 25 "25 23 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  874 (  rpad            PGUID 11 f t f 3 f 25 "25 23 25" 100 0 0 100  rpad - ));
 DESCR("right-pad string to length");
-DATA(insert OID =  875 (  ltrim                   PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  875 (  ltrim                   PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  ltrim - ));
 DESCR("left-pad string to length");
-DATA(insert OID =  876 (  rtrim                   PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  876 (  rtrim                   PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  rtrim - ));
 DESCR("right-pad string to length");
-DATA(insert OID =  877 (  substr          PGUID 14 f t f 3 f 25 "25 23 23" 100 0 0 100  "select text_substr($1, $2, $3)" - ));
+DATA(insert OID =  877 (  substr          PGUID 11 f t f 3 f 25 "25 23 23" 100 0 0 100  text_substr - ));
 DESCR("return portion of string");
-DATA(insert OID =  878 (  translate    PGUID 11 f t f 3 f 25 "25 18 18" 100 0 0 100  foo bar ));
+DATA(insert OID =  878 (  translate    PGUID 11 f t f 3 f 25 "25 18 18" 100 0 0 100  translate - ));
 DESCR("modify string by substring replacement");
 DATA(insert OID =  879 (  lpad            PGUID 14 f t f 2 f 25 "25 23" 100 0 0 100  "select lpad($1, $2, \' \')" - ));
 DESCR("left-pad string to length");
@@ -2080,226 +2078,226 @@ DATA(insert OID =  882 (  rtrim                  PGUID 14 f t f 1 f 25 "25" 100 0 0 100  "sel
 DESCR("remove trailing characters from string");
 DATA(insert OID =  883 (  substr          PGUID 14 f t f 2 f 25 "25 23" 100 0 0 100  "select text_substr($1, $2, -1)" - ));
 DESCR("return portion of string");
-DATA(insert OID =  884 (  btrim                   PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  foo bar ));
+DATA(insert OID =  884 (  btrim                   PGUID 11 f t f 2 f 25 "25 25" 100 0 0 100  btrim - ));
 DESCR("trim both ends of string");
 DATA(insert OID =  885 (  btrim                   PGUID 14 f t f 1 f 25 "25" 100 0 0 100  "select btrim($1, \' \')" - ));
 DESCR("trim both ends of string");
 
 
 /* SEQUENCEs nextval & currval functions */
-DATA(insert OID =  1317 (  nextval        PGUID 11 f t f 1 f 23 "25" 100 0 0 100  foo bar ));
+DATA(insert OID =  1317 (  nextval        PGUID 11 f t f 1 f 23 "25" 100 0 0 100  nextval - ));
 DESCR("sequence next value");
-DATA(insert OID =  1319 (  currval        PGUID 11 f t f 1 f 23 "25" 100 0 0 100  foo bar ));
+DATA(insert OID =  1319 (  currval        PGUID 11 f t f 1 f 23 "25" 100 0 0 100  currval - ));
 DESCR("sequence current value");
-DATA(insert OID =  1618 (  setval         PGUID 11 f t f 2 f 23 "25 23" 100 0 0 100  foo bar ));
+DATA(insert OID =  1618 (  setval         PGUID 11 f t f 2 f 23 "25 23" 100 0 0 100  setval - ));
 DESCR("sequence set value");
 
 /* for multi-byte support */
-DATA(insert OID = 1039 (  getdatabaseencoding     PGUID 11 f t f 0 f 19 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1039 (  getdatabaseencoding     PGUID 11 f t f 0 f 19 "0" 100 0 0 100  getdatabaseencoding - ));
 
 /* System-view support functions */
-DATA(insert OID = 1640 (  pg_get_ruledef          PGUID 11 f t f 1 f 25 "19" 100 0 0 100  foo bar ));
+DATA(insert OID = 1640 (  pg_get_ruledef          PGUID 11 f t f 1 f 25 "19" 100 0 0 100  pg_get_ruledef - ));
 DESCR("source text of a rule");
-DATA(insert OID = 1641 (  pg_get_viewdef          PGUID 11 f t f 1 f 25 "19" 100 0 0 100  foo bar ));
+DATA(insert OID = 1641 (  pg_get_viewdef          PGUID 11 f t f 1 f 25 "19" 100 0 0 100  pg_get_viewdef - ));
 DESCR("select statement of a view");
-DATA(insert OID = 1642 (  pg_get_userbyid         PGUID 11 f t f 1 f 19 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1642 (  pg_get_userbyid         PGUID 11 f t f 1 f 19 "23" 100 0 0 100  pg_get_userbyid - ));
 DESCR("user name by UID (with fallback)");
-DATA(insert OID = 1643 (  pg_get_indexdef         PGUID 11 f t f 1 f 25 "26" 100 0 0 100  foo bar ));
+DATA(insert OID = 1643 (  pg_get_indexdef         PGUID 11 f t f 1 f 25 "26" 100 0 0 100  pg_get_indexdef - ));
 DESCR("index description");
 
 /* for mac type support */
-DATA(insert OID = 436 (  macaddr_in                    PGUID 11 f t f 1 f 829 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 436 (  macaddr_in                    PGUID 11 f t f 1 f 829 "0" 100 0 0 100  macaddr_in - ));
 DESCR("(internal)");
-DATA(insert OID = 437 (  macaddr_out           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 437 (  macaddr_out           PGUID 11 f t f 1 f 23 "0" 100 0 0 100  macaddr_out - ));
 DESCR("(internal)");
 
-DATA(insert OID = 830 (  macaddr_eq               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  foo bar ));
+DATA(insert OID = 830 (  macaddr_eq               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  macaddr_eq - ));
 DESCR("equal");
-DATA(insert OID = 831 (  macaddr_lt               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  foo bar ));
+DATA(insert OID = 831 (  macaddr_lt               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  macaddr_lt - ));
 DESCR("less-than");
-DATA(insert OID = 832 (  macaddr_le               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  foo bar ));
+DATA(insert OID = 832 (  macaddr_le               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  macaddr_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 833 (  macaddr_gt               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  foo bar ));
+DATA(insert OID = 833 (  macaddr_gt               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  macaddr_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 834 (  macaddr_ge               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  foo bar ));
+DATA(insert OID = 834 (  macaddr_ge               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  macaddr_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 835 (  macaddr_ne               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  foo bar ));
+DATA(insert OID = 835 (  macaddr_ne               PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100  macaddr_ne - ));
 DESCR("not equal");
-DATA(insert OID = 836 (  macaddr_cmp      PGUID 11 f t f 2 f 23 "829 829" 100 0 0 100  foo bar ));
+DATA(insert OID = 836 (  macaddr_cmp      PGUID 11 f t f 2 f 23 "829 829" 100 0 0 100  macaddr_cmp - ));
 DESCR("less-equal-greater");
-DATA(insert OID = 837 (  macaddr_manuf    PGUID 11 f t f 1 f 25 "829" 100 0 0 100  foo bar ));
+DATA(insert OID = 837 (  macaddr_manuf    PGUID 11 f t f 1 f 25 "829" 100 0 0 100  macaddr_manuf - ));
 DESCR("MAC manufacturer");
 
 /* for inet type support */
-DATA(insert OID = 910 (  inet_in                       PGUID 11 f t f 1 f 869 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 910 (  inet_in                       PGUID 11 f t f 1 f 869 "0" 100 0 0 100  inet_in - ));
 DESCR("(internal)");
-DATA(insert OID = 911 (  inet_out                      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 911 (  inet_out                      PGUID 11 f t f 1 f 23 "0" 100 0 0 100  inet_out - ));
 DESCR("(internal)");
 
 /* for cidr type support */
-DATA(insert OID = 1267 (  cidr_in           PGUID 11 f t f 1 f 650 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1267 (  cidr_in           PGUID 11 f t f 1 f 650 "0" 100 0 0 100  cidr_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1416 (  cidr_out                     PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1416 (  cidr_out                     PGUID 11 f t f 1 f 23 "0" 100 0 0 100  cidr_out - ));
 DESCR("(internal)");
 
 /* these are used for both inet and cidr */
-DATA(insert OID = 920 (  network_eq               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 920 (  network_eq               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_eq - ));
 DESCR("equal");
-DATA(insert OID = 921 (  network_lt               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 921 (  network_lt               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_lt - ));
 DESCR("less-than");
-DATA(insert OID = 922 (  network_le               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 922 (  network_le               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_le - ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 923 (  network_gt               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 923 (  network_gt               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 924 (  network_ge               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 924 (  network_ge               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 925 (  network_ne               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 925 (  network_ne               PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_ne - ));
 DESCR("not equal");
-DATA(insert OID = 926 (  network_cmp              PGUID 11 f t f 2 f 23 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 926 (  network_cmp              PGUID 11 f t f 2 f 23 "869 869" 100 0 0 100  network_cmp - ));
 DESCR("less-equal-greater");
-DATA(insert OID = 927 (  network_sub              PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 927 (  network_sub              PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_sub - ));
 DESCR("is-subnet");
-DATA(insert OID = 928 (  network_subeq            PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 928 (  network_subeq            PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_subeq - ));
 DESCR("is-subnet-or-equal");
-DATA(insert OID = 929 (  network_sup              PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 929 (  network_sup              PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_sup - ));
 DESCR("is-supernet");
-DATA(insert OID = 930 (  network_supeq            PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  foo bar ));
+DATA(insert OID = 930 (  network_supeq            PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100  network_supeq - ));
 DESCR("is-supernet-or-equal");
 
 /* inet/cidr versions */
-DATA(insert OID = 940 (  network_netmask               PGUID 11 f t f 1 f 25 "869" 100 0 0 100  foo bar ));
+DATA(insert OID = 940 (  network_netmask               PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_netmask - ));
 DESCR("netmask of address");
-DATA(insert OID = 941 (  network_masklen               PGUID 11 f t f 1 f 23 "869" 100 0 0 100  foo bar ));
+DATA(insert OID = 941 (  network_masklen               PGUID 11 f t f 1 f 23 "869" 100 0 0 100  network_masklen - ));
 DESCR("netmask length");
-DATA(insert OID = 945 (  network_broadcast             PGUID 11 f t f 1 f 25 "869" 100 0 0 100  foo bar ));
+DATA(insert OID = 945 (  network_broadcast             PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_broadcast - ));
 DESCR("broadcast address");
-DATA(insert OID = 682 (  network_host                  PGUID 11 f t f 1 f 25 "869" 100 0 0 100  foo bar ));
+DATA(insert OID = 682 (  network_host                  PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_host - ));
 DESCR("host address");
-DATA(insert OID = 473 (  network_network               PGUID 11 f t f 1 f 25 "869" 100 0 0 100  foo bar ));
+DATA(insert OID = 473 (  network_network               PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_network - ));
 DESCR("network address");
 
 /* shortcut names */
-DATA(insert OID = 696 (  netmask                               PGUID 14 f t f 1 f 25 "869" 100 0 0 100  "select network_netmask($1)" - ));
+DATA(insert OID = 696 (  netmask                               PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_netmask - ));
 DESCR("netmask of address");
-DATA(insert OID = 697 (  masklen                               PGUID 14 f t f 1 f 23 "869" 100 0 0 100  "select network_masklen($1)" - ));
+DATA(insert OID = 697 (  masklen                               PGUID 11 f t f 1 f 23 "869" 100 0 0 100  network_masklen - ));
 DESCR("netmask length");
-DATA(insert OID = 698 (  broadcast                             PGUID 14 f t f 1 f 25 "869" 100 0 0 100  "select network_broadcast($1)" - ));
+DATA(insert OID = 698 (  broadcast                             PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_broadcast - ));
 DESCR("broadcast address");
-DATA(insert OID = 699 (  host                                  PGUID 14 f t f 1 f 25 "869" 100 0 0 100  "select network_host($1)" - ));
+DATA(insert OID = 699 (  host                                  PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_host - ));
 DESCR("host address");
-DATA(insert OID = 683 (  network                               PGUID 14 f t f 1 f 25 "869" 100 0 0 100  "select network_network($1)" - ));
+DATA(insert OID = 683 (  network                               PGUID 11 f t f 1 f 25 "869" 100 0 0 100  network_network - ));
 DESCR("network address");
 
 /* OID's 1700 - 1799 NUMERIC data type */
-DATA(insert OID = 1701 ( numeric_in                            PGUID 11 f t f 1 f 1700 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1701 ( numeric_in                            PGUID 11 f t f 1 f 1700 "0" 100 0 0 100  numeric_in - ));
 DESCR("(internal)");
-DATA(insert OID = 1702 ( numeric_out                   PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
+DATA(insert OID = 1702 ( numeric_out                   PGUID 11 f t f 1 f 23 "0" 100 0 0 100  numeric_out - ));
 DESCR("(internal)");
-DATA(insert OID = 1703 ( numeric                               PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1703 ( numeric                               PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  numeric - ));
 DESCR("(internal)");
-DATA(insert OID = 1704 ( numeric_abs                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1704 ( numeric_abs                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_abs - ));
 DESCR("absolute value");
-DATA(insert OID = 1705 ( abs                                   PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_abs($1)" - ));
+DATA(insert OID = 1705 ( abs                                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_abs - ));
 DESCR("absolute value");
-DATA(insert OID = 1706 ( numeric_sign                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1706 ( numeric_sign                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_sign - ));
 DESCR("sign of value");
-DATA(insert OID = 1707 ( sign                                  PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_sign($1)" - ));
+DATA(insert OID = 1707 ( sign                                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_sign - ));
 DESCR("sign of value");
-DATA(insert OID = 1708 ( numeric_round                 PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1708 ( numeric_round                 PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  numeric_round - ));
 DESCR("value rounded to 'scale'");
-DATA(insert OID = 1709 ( round                                 PGUID 14 f t f 2 f 1700 "1700 23" 100 0 0 100  "select numeric_round($1,$2)" - ));
+DATA(insert OID = 1709 ( round                                 PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  numeric_round - ));
 DESCR("value rounded to 'scale'");
 DATA(insert OID = 1710 ( round                                 PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_round($1,0)" - ));
 DESCR("value rounded to 'scale' of zero");
-DATA(insert OID = 1711 ( numeric_trunc                 PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1711 ( numeric_trunc                 PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  numeric_trunc - ));
 DESCR("value truncated to 'scale'");
-DATA(insert OID = 1712 ( trunc                                 PGUID 14 f t f 2 f 1700 "1700 23" 100 0 0 100  "select numeric_trunc($1,$2)" - ));
+DATA(insert OID = 1712 ( trunc                                 PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100  numeric_trunc - ));
 DESCR("value truncated to 'scale'");
 DATA(insert OID = 1713 ( trunc                                 PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_trunc($1,0)" - ));
 DESCR("value truncated to 'scale' of zero");
-DATA(insert OID = 1714 ( numeric_ceil                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1714 ( numeric_ceil                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_ceil - ));
 DESCR("smallest integer >= value");
-DATA(insert OID = 1715 ( ceil                                  PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_ceil($1)" - ));
+DATA(insert OID = 1715 ( ceil                                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_ceil - ));
 DESCR("smallest integer >= value");
-DATA(insert OID = 1716 ( numeric_floor                 PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1716 ( numeric_floor                 PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_floor - ));
 DESCR("largest integer <= value");
-DATA(insert OID = 1717 ( floor                                 PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_floor($1)" - ));
+DATA(insert OID = 1717 ( floor                                 PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_floor - ));
 DESCR("largest integer <= value");
-DATA(insert OID = 1718 ( numeric_eq                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1718 ( numeric_eq                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  numeric_eq - ));
 DESCR("equal");
-DATA(insert OID = 1719 ( numeric_ne                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1719 ( numeric_ne                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  numeric_ne - ));
 DESCR("not equal");
-DATA(insert OID = 1720 ( numeric_gt                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1720 ( numeric_gt                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  numeric_gt - ));
 DESCR("greater-than");
-DATA(insert OID = 1721 ( numeric_ge                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1721 ( numeric_ge                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  numeric_ge - ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1722 ( numeric_lt                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1722 ( numeric_lt                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  numeric_lt - ));
 DESCR("lower-than");
-DATA(insert OID = 1723 ( numeric_le                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1723 ( numeric_le                            PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100  numeric_le - ));
 DESCR("lower-than-or-equal");
-DATA(insert OID = 1724 ( numeric_add                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1724 ( numeric_add                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_add - ));
 DESCR("addition");
-DATA(insert OID = 1725 ( numeric_sub                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1725 ( numeric_sub                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_sub - ));
 DESCR("subtract");
-DATA(insert OID = 1726 ( numeric_mul                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1726 ( numeric_mul                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_mul - ));
 DESCR("multiply");
-DATA(insert OID = 1727 ( numeric_div                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1727 ( numeric_div                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_div - ));
 DESCR("divide");
-DATA(insert OID = 1728 ( numeric_mod                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1728 ( numeric_mod                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_mod - ));
 DESCR("modulus");
-DATA(insert OID = 1729 ( mod                                   PGUID 14 f t f 2 f 1700 "1700 1700" 100 0 0 100  "select numeric_mod($1,$2)" - ));
+DATA(insert OID = 1729 ( mod                                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_mod - ));
 DESCR("modulus");
-DATA(insert OID = 1730 ( numeric_sqrt                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1730 ( numeric_sqrt                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_sqrt - ));
 DESCR("square root");
-DATA(insert OID = 1731 ( sqrt                                  PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_sqrt($1)" - ));
+DATA(insert OID = 1731 ( sqrt                                  PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_sqrt - ));
 DESCR("square root");
-DATA(insert OID = 1732 ( numeric_exp                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1732 ( numeric_exp                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_exp - ));
 DESCR("e raised to the power of n");
-DATA(insert OID = 1733 ( exp                                   PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_exp($1)" - ));
+DATA(insert OID = 1733 ( exp                                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_exp - ));
 DESCR("e raised to the power of n");
-DATA(insert OID = 1734 ( numeric_ln                            PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1734 ( numeric_ln                            PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_ln - ));
 DESCR("natural logarithm of n");
-DATA(insert OID = 1735 ( ln                                            PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100  "select numeric_ln($1)" - ));
+DATA(insert OID = 1735 ( ln                                            PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_ln - ));
 DESCR("natural logarithm of n");
-DATA(insert OID = 1736 ( numeric_log                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1736 ( numeric_log                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_log - ));
 DESCR("logarithm base m of n");
-DATA(insert OID = 1737 ( log                                   PGUID 14 f t f 2 f 1700 "1700 1700" 100 0 0 100  "select numeric_log($1,$2)" - ));
+DATA(insert OID = 1737 ( log                                   PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_log - ));
 DESCR("logarithm base m of n");
-DATA(insert OID = 1738 ( numeric_power                 PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1738 ( numeric_power                 PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_power - ));
 DESCR("m raised to the power of n");
-DATA(insert OID = 1739 ( power                                 PGUID 14 f t f 2 f 1700 "1700 1700" 100 0 0 100  "select numeric_power($1,$2)" - ));
+DATA(insert OID = 1739 ( power                                 PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_power - ));
 DESCR("m raised to the power of n");
-DATA(insert OID = 1740 ( int4_numeric                  PGUID 11 f t f 1 f 1700 "23" 100 0 0 100  foo bar ));
+DATA(insert OID = 1740 ( int4_numeric                  PGUID 11 f t f 1 f 1700 "23" 100 0 0 100  int4_numeric - ));
 DESCR("(internal)");
-DATA(insert OID = 1741 ( numeric                               PGUID 14 f t f 1 f 1700 "23" 100 0 0 100  "select int4_numeric($1)" - ));
+DATA(insert OID = 1741 ( numeric                               PGUID 11 f t f 1 f 1700 "23" 100 0 0 100  int4_numeric - ));
 DESCR("(internal)");
-DATA(insert OID = 1742 ( float4_numeric                        PGUID 11 f t f 1 f 1700 "700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1742 ( float4_numeric                        PGUID 11 f t f 1 f 1700 "700" 100 0 0 100  float4_numeric - ));
 DESCR("(internal)");
-DATA(insert OID = 1743 ( numeric                               PGUID 14 f t f 1 f 1700 "700" 100 0 0 100  "select float4_numeric($1)" - ));
+DATA(insert OID = 1743 ( numeric                               PGUID 11 f t f 1 f 1700 "700" 100 0 0 100  float4_numeric - ));
 DESCR("(internal)");
-DATA(insert OID = 1744 ( float8_numeric                        PGUID 11 f t f 1 f 1700 "701" 100 0 0 100  foo bar ));
+DATA(insert OID = 1744 ( float8_numeric                        PGUID 11 f t f 1 f 1700 "701" 100 0 0 100  float8_numeric - ));
 DESCR("(internal)");
-DATA(insert OID = 1745 ( numeric                               PGUID 14 f t f 1 f 1700 "701" 100 0 0 100  "select float8_numeric($1)" - ));
+DATA(insert OID = 1745 ( numeric                               PGUID 11 f t f 1 f 1700 "701" 100 0 0 100  float8_numeric - ));
 DESCR("(internal)");
-DATA(insert OID = 1746 ( numeric_int4                  PGUID 11 f t f 1 f 23 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1746 ( numeric_int4                  PGUID 11 f t f 1 f 23 "1700" 100 0 0 100  numeric_int4 - ));
 DESCR("(internal)");
-DATA(insert OID = 1747 ( int4                                  PGUID 14 f t f 1 f 23 "1700" 100 0 0 100  "select numeric_int4($1)" - ));
+DATA(insert OID = 1747 ( int4                                  PGUID 11 f t f 1 f 23 "1700" 100 0 0 100  numeric_int4 - ));
 DESCR("(internal)");
-DATA(insert OID = 1748 ( numeric_float4                        PGUID 11 f t f 1 f 700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1748 ( numeric_float4                        PGUID 11 f t f 1 f 700 "1700" 100 0 0 100  numeric_float4 - ));
 DESCR("(internal)");
-DATA(insert OID = 1749 ( float4                                        PGUID 14 f t f 1 f 700 "1700" 100 0 0 100  "select numeric_float4($1)" - ));
+DATA(insert OID = 1749 ( float4                                        PGUID 11 f t f 1 f 700 "1700" 100 0 0 100  numeric_float4 - ));
 DESCR("(internal)");
-DATA(insert OID = 1750 ( numeric_float8                        PGUID 11 f t f 1 f 701 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1750 ( numeric_float8                        PGUID 11 f t f 1 f 701 "1700" 100 0 0 100  numeric_float8 - ));
 DESCR("(internal)");
-DATA(insert OID = 1751 ( float8                                        PGUID 14 f t f 1 f 701 "1700" 100 0 0 100  "select numeric_float8($1)" - ));
+DATA(insert OID = 1751 ( float8                                        PGUID 11 f t f 1 f 701 "1700" 100 0 0 100  numeric_float8 - ));
 DESCR("(internal)");
-DATA(insert OID = 1764 ( numeric_inc                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1764 ( numeric_inc                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_inc - ));
 DESCR("increment by one");
-DATA(insert OID = 1765 ( numeric_dec                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1765 ( numeric_dec                   PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100  numeric_dec - ));
 DESCR("decrement by one");
-DATA(insert OID = 1766 ( numeric_smaller               PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1766 ( numeric_smaller               PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_smaller - ));
 DESCR("smaller of two numbers");
-DATA(insert OID = 1767 ( numeric_larger                        PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  foo bar ));
+DATA(insert OID = 1767 ( numeric_larger                        PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100  numeric_larger - ));
 DESCR("larger of two numbers");
 
 

diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index b5c35f805a5cdff98d1dd3502ad88c59955224cb..edee95aa8ebcd053cfbd91b72e5be09077e56fb9 100644 (file)
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fmgrtab.h,v 1.9 1999/02/13 23:22:21 momjian Exp $
+ * $Id: fmgrtab.h,v 1.10 1999/03/29 01:30:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,13 +17,13 @@
 typedef struct
 {
        Oid                     proid;
-       uint16          nargs;
+       int                     nargs;
        func_ptr        func;
-       char       *funcName;
+       int                     dummy;                  /* pad struct to 4 words for fast indexing */
 } FmgrCall;
 
 extern FmgrCall *fmgr_isbuiltin(Oid id);
-extern func_ptr fmgr_lookupByName(char *name);
+
 extern void load_file(char *filename);
 
 #endif  /* FMGRTAB_H */

diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out
index c02d51d0a0c302bd69f9c3b377c83a189963f29a..f044006daad4e2c47e2e7f9bd85f726c411318e0 100644 (file)
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -6,6 +6,114 @@ oid|proname
 ---+-------
 (0 rows)
 
+QUERY: SELECT p1.oid, p1.proname, p2.oid, p2.proname
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.proname = p2.proname AND
+    p1.pronargs = p2.pronargs AND
+    p1.proargtypes = p2.proargtypes;
+oid|proname|oid|proname
+---+-------+---+-------
+(0 rows)
+
+QUERY: SELECT p1.oid, p1.proname, p2.oid, p2.proname
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proisinh != p2.proisinh OR
+     p1.proistrusted != p2.proistrusted OR
+     p1.proiscachable != p2.proiscachable OR
+     p1.pronargs != p2.pronargs OR
+     p1.proretset != p2.proretset);
+oid|proname|oid|proname
+---+-------+---+-------
+(0 rows)
+
+QUERY: SELECT DISTINCT p1.prorettype, p2.prorettype
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.prorettype < p2.prorettype);
+prorettype|prorettype
+----------+----------
+        18|        25
+        25|      1043
+(2 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[0], p2.proargtypes[0]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[0] < p2.proargtypes[0]);
+proargtypes|proargtypes
+-----------+-----------
+         25|       1043
+       1042|       1043
+(2 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[1], p2.proargtypes[1]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[1] < p2.proargtypes[1]);
+proargtypes|proargtypes
+-----------+-----------
+(0 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[2], p2.proargtypes[2]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[2] < p2.proargtypes[2]);
+proargtypes|proargtypes
+-----------+-----------
+(0 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[3], p2.proargtypes[3]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[3] < p2.proargtypes[3]);
+proargtypes|proargtypes
+-----------+-----------
+(0 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[4], p2.proargtypes[4]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[4] < p2.proargtypes[4]);
+proargtypes|proargtypes
+-----------+-----------
+(0 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[5], p2.proargtypes[5]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[5] < p2.proargtypes[5]);
+proargtypes|proargtypes
+-----------+-----------
+(0 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[6], p2.proargtypes[6]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[6] < p2.proargtypes[6]);
+proargtypes|proargtypes
+-----------+-----------
+(0 rows)
+
+QUERY: SELECT DISTINCT p1.proargtypes[7], p2.proargtypes[7]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[7] < p2.proargtypes[7]);
+proargtypes|proargtypes
+-----------+-----------
+(0 rows)
+
 QUERY: SELECT p1.oid, p1.oprname
 FROM pg_operator as p1
 WHERE (p1.oprkind != 'b' AND p1.oprkind != 'l' AND p1.oprkind != 'r') OR

diff --git a/src/test/regress/sql/opr_sanity.sql b/src/test/regress/sql/opr_sanity.sql
index 7e4010618d6385ca2baa020bdb93a530ae59dc2e..63a24c7b53d3a9cce3379ca78fb3e6d0ddbf537e 100644 (file)
--- a/src/test/regress/sql/opr_sanity.sql
+++ b/src/test/regress/sql/opr_sanity.sql
@@ -28,6 +28,92 @@ FROM pg_proc as p1
 WHERE p1.prolang = 0 OR p1.prorettype = 0 OR
     p1.pronargs < 0 OR p1.pronargs > 9;
 
+-- Look for conflicting proc definitions (same names and input datatypes).
+
+SELECT p1.oid, p1.proname, p2.oid, p2.proname
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.proname = p2.proname AND
+    p1.pronargs = p2.pronargs AND
+    p1.proargtypes = p2.proargtypes;
+
+-- Considering only built-in procs (prolang = 11), look for multiple uses
+-- of the same internal function (ie, matching prosrc fields).  It's OK to
+-- have several entries with different pronames for the same internal function,
+-- but conflicts in the number of arguments and other critical items should
+-- be complained of.
+
+SELECT p1.oid, p1.proname, p2.oid, p2.proname
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proisinh != p2.proisinh OR
+     p1.proistrusted != p2.proistrusted OR
+     p1.proiscachable != p2.proiscachable OR
+     p1.pronargs != p2.pronargs OR
+     p1.proretset != p2.proretset);
+
+-- Look for uses of different type OIDs in the argument/result type fields
+-- for different aliases of the same built-in function.
+-- This indicates that the types are being presumed to be binary-equivalent.
+-- That's not wrong, necessarily, but we make lists of all the types being
+-- so treated.  Note that the expected output of this part of the test will
+-- need to be modified whenever new pairs of types are made binary-equivalent!
+
+SELECT DISTINCT p1.prorettype, p2.prorettype
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.prorettype < p2.prorettype);
+
+SELECT DISTINCT p1.proargtypes[0], p2.proargtypes[0]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[0] < p2.proargtypes[0]);
+
+SELECT DISTINCT p1.proargtypes[1], p2.proargtypes[1]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[1] < p2.proargtypes[1]);
+
+SELECT DISTINCT p1.proargtypes[2], p2.proargtypes[2]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[2] < p2.proargtypes[2]);
+
+SELECT DISTINCT p1.proargtypes[3], p2.proargtypes[3]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[3] < p2.proargtypes[3]);
+
+SELECT DISTINCT p1.proargtypes[4], p2.proargtypes[4]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[4] < p2.proargtypes[4]);
+
+SELECT DISTINCT p1.proargtypes[5], p2.proargtypes[5]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[5] < p2.proargtypes[5]);
+
+SELECT DISTINCT p1.proargtypes[6], p2.proargtypes[6]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[6] < p2.proargtypes[6]);
+
+SELECT DISTINCT p1.proargtypes[7], p2.proargtypes[7]
+FROM pg_proc AS p1, pg_proc AS p2
+WHERE p1.oid != p2.oid AND
+    p1.prosrc = p2.prosrc AND p1.prolang = 11 AND p2.prolang = 11 AND
+    (p1.proargtypes[7] < p2.proargtypes[7]);
+
 -- **************** pg_operator ****************
 
 -- Look for illegal values in pg_operator fields.