diff --git a/expected/timestamp.out b/expected/timestamp.out
diff --git a/expected/timestamptz.out b/expected/timestamptz.out
diff --git a/expected/timetz.out b/expected/timetz.out
diff --git a/expected/uuid.out b/expected/uuid.out
diff --git a/expected/varbit.out b/expected/varbit.out
diff --git a/expected/varchar.out b/expected/varchar.out
diff --git a/expected/varchar_1.out b/expected/varchar_1.out
diff --git a/pg_gist_hamming--1.0--1.1.sql b/pg_gist_hamming--1.0--1.1.sql
@@ -4,124 +4,11 @@
 \echo Use "ALTER EXTENSION pg_gist_hamming UPDATE TO '1.1'" to load this file. \quit
 
 -- Index-only scan support new in 9.5.
-CREATE FUNCTION gbt_oid_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_int2_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_int4_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
 
 CREATE FUNCTION gbt_int8_fetch(internal)
 RETURNS internal
 AS 'MODULE_PATHNAME'
 LANGUAGE C IMMUTABLE STRICT;
 
-CREATE FUNCTION gbt_float4_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_float8_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_ts_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_time_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_date_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_intv_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_cash_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_macad_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_var_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-ALTER OPERATOR FAMILY gist_oid_ops USING gist ADD
-	FUNCTION	9 (oid, oid) gbt_oid_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_int2_ops USING gist ADD
-	FUNCTION	9 (int2, int2) gbt_int2_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_int4_ops USING gist ADD
-	FUNCTION	9 (int4, int4) gbt_int4_fetch (internal) ;
-
 ALTER OPERATOR FAMILY gist_int8_ops USING gist ADD
 	FUNCTION	9 (int8, int8) gbt_int8_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_float4_ops USING gist ADD
-	FUNCTION	9 (float4, float4) gbt_float4_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_float8_ops USING gist ADD
-	FUNCTION	9 (float8, float8) gbt_float8_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_timestamp_ops USING gist ADD
-	FUNCTION	9 (timestamp, timestamp) gbt_ts_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_timestamptz_ops USING gist ADD
-	FUNCTION	9 (timestamptz, timestamptz) gbt_ts_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_time_ops USING gist ADD
-	FUNCTION	9 (time, time) gbt_time_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_date_ops USING gist ADD
-	FUNCTION	9 (date, date) gbt_date_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_interval_ops USING gist ADD
-	FUNCTION	9 (interval, interval) gbt_intv_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_cash_ops USING gist ADD
-	FUNCTION	9 (money, money) gbt_cash_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_macaddr_ops USING gist ADD
-	FUNCTION	9 (macaddr, macaddr) gbt_macad_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_text_ops USING gist ADD
-	FUNCTION	9 (text, text) gbt_var_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_bpchar_ops USING gist ADD
-	FUNCTION	9 (bpchar, bpchar) gbt_var_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_bytea_ops USING gist ADD
-	FUNCTION	9 (bytea, bytea) gbt_var_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_numeric_ops USING gist ADD
-	FUNCTION	9 (numeric, numeric) gbt_var_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_bit_ops USING gist ADD
-	FUNCTION	9 (bit, bit) gbt_var_fetch (internal) ;
-
-ALTER OPERATOR FAMILY gist_vbit_ops USING gist ADD
-	FUNCTION	9 (varbit, varbit) gbt_var_fetch (internal) ;
diff --git a/pg_gist_hamming--1.1--1.2.sql b/pg_gist_hamming--1.1--1.2.sql
@@ -13,51 +13,8 @@ UPDATE pg_catalog.pg_proc SET
   pronargs = pg_catalog.array_length(newtypes, 1)
 FROM (VALUES
 (NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
-('gbt_oid_distance(internal,oid,int2,oid)', '{internal,oid,int2,oid,internal}'),
-('gbt_oid_union(bytea,internal)', '{internal,internal}'),
-('gbt_oid_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
-('gbt_int2_distance(internal,int2,int2,oid)', '{internal,int2,int2,oid,internal}'),
-('gbt_int2_union(bytea,internal)', '{internal,internal}'),
-('gbt_int2_same(internal,internal,internal)', '{gbtreekey4,gbtreekey4,internal}'),
-('gbt_int4_distance(internal,int4,int2,oid)', '{internal,int4,int2,oid,internal}'),
-('gbt_int4_union(bytea,internal)', '{internal,internal}'),
-('gbt_int4_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
 ('gbt_int8_distance(internal,int8,int2,oid)', '{internal,int8,int2,oid,internal}'),
 ('gbt_int8_union(bytea,internal)', '{internal,internal}'),
 ('gbt_int8_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
-('gbt_float4_distance(internal,float4,int2,oid)', '{internal,float4,int2,oid,internal}'),
-('gbt_float4_union(bytea,internal)', '{internal,internal}'),
-('gbt_float4_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
-('gbt_float8_distance(internal,float8,int2,oid)', '{internal,float8,int2,oid,internal}'),
-('gbt_float8_union(bytea,internal)', '{internal,internal}'),
-('gbt_float8_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
-('gbt_ts_distance(internal,timestamp,int2,oid)', '{internal,timestamp,int2,oid,internal}'),
-('gbt_tstz_distance(internal,timestamptz,int2,oid)', '{internal,timestamptz,int2,oid,internal}'),
-('gbt_ts_union(bytea,internal)', '{internal,internal}'),
-('gbt_ts_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
-('gbt_time_distance(internal,time,int2,oid)', '{internal,time,int2,oid,internal}'),
-('gbt_time_union(bytea,internal)', '{internal,internal}'),
-('gbt_time_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
-('gbt_date_distance(internal,date,int2,oid)', '{internal,date,int2,oid,internal}'),
-('gbt_date_union(bytea,internal)', '{internal,internal}'),
-('gbt_date_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
-('gbt_intv_distance(internal,interval,int2,oid)', '{internal,interval,int2,oid,internal}'),
-('gbt_intv_union(bytea,internal)', '{internal,internal}'),
-('gbt_intv_same(internal,internal,internal)', '{gbtreekey32,gbtreekey32,internal}'),
-('gbt_cash_distance(internal,money,int2,oid)', '{internal,money,int2,oid,internal}'),
-('gbt_cash_union(bytea,internal)', '{internal,internal}'),
-('gbt_cash_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
-('gbt_macad_union(bytea,internal)', '{internal,internal}'),
-('gbt_macad_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
-('gbt_text_union(bytea,internal)', '{internal,internal}'),
-('gbt_text_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
-('gbt_bytea_union(bytea,internal)', '{internal,internal}'),
-('gbt_bytea_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
-('gbt_numeric_union(bytea,internal)', '{internal,internal}'),
-('gbt_numeric_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
-('gbt_bit_union(bytea,internal)', '{internal,internal}'),
-('gbt_bit_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
-('gbt_inet_union(bytea,internal)', '{internal,internal}'),
-('gbt_inet_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}')
 ) AS update_data (oldproc, newtypes)
 WHERE oid = pg_catalog.to_regprocedure(oldproc);
diff --git a/pg_gist_hamming--1.2--1.3.sql b/pg_gist_hamming--1.2--1.3.sql
@@ -4,62 +4,3 @@
 \echo Use "ALTER EXTENSION pg_gist_hamming UPDATE TO '1.3'" to load this file. \quit
 
 -- Add support for indexing UUID columns
-
--- define the GiST support methods
-CREATE FUNCTION gbt_uuid_consistent(internal,uuid,int2,oid,internal)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_uuid_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_uuid_compress(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_uuid_penalty(internal,internal,internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_uuid_picksplit(internal, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_uuid_union(internal, internal)
-RETURNS gbtreekey32
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_uuid_same(gbtreekey32, gbtreekey32, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
--- Create the operator class
-CREATE OPERATOR CLASS gist_uuid_ops
-DEFAULT FOR TYPE uuid USING gist
-AS
-	OPERATOR	1	<   ,
-	OPERATOR	2	<=  ,
-	OPERATOR	3	=   ,
-	OPERATOR	4	>=  ,
-	OPERATOR	5	>   ,
-	FUNCTION	1	gbt_uuid_consistent (internal, uuid, int2, oid, internal),
-	FUNCTION	2	gbt_uuid_union (internal, internal),
-	FUNCTION	3	gbt_uuid_compress (internal),
-	FUNCTION	4	gbt_decompress (internal),
-	FUNCTION	5	gbt_uuid_penalty (internal, internal, internal),
-	FUNCTION	6	gbt_uuid_picksplit (internal, internal),
-	FUNCTION	7	gbt_uuid_same (gbtreekey32, gbtreekey32, internal),
-	STORAGE		gbtreekey32;
-
--- These are "loose" in the opfamily for consistency with the rest of pg_gist_hamming
-ALTER OPERATOR FAMILY gist_uuid_ops USING gist ADD
-	OPERATOR	6	<>  (uuid, uuid) ,
-	FUNCTION	9 (uuid, uuid) gbt_uuid_fetch (internal) ;
diff --git a/pg_gist_hamming--1.2.sql b/pg_gist_hamming--1.2.sql
diff --git a/pg_gist_hamming--1.3--1.4.sql b/pg_gist_hamming--1.3--1.4.sql
@@ -4,61 +4,3 @@
 \echo Use "ALTER EXTENSION pg_gist_hamming UPDATE TO '1.4'" to load this file. \quit
 
 -- Add support for indexing macaddr8 columns
-
--- define the GiST support methods
-CREATE FUNCTION gbt_macad8_consistent(internal,macaddr8,int2,oid,internal)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_macad8_compress(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_macad8_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_macad8_penalty(internal,internal,internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_macad8_picksplit(internal, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_macad8_union(internal, internal)
-RETURNS gbtreekey16
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_macad8_same(gbtreekey16, gbtreekey16, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
--- Create the operator class
-CREATE OPERATOR CLASS gist_macaddr8_ops
-DEFAULT FOR TYPE macaddr8 USING gist
-AS
-	OPERATOR	1	< ,
-	OPERATOR	2	<= ,
-	OPERATOR	3	= ,
-	OPERATOR	4	>= ,
-	OPERATOR	5	> ,
-	FUNCTION	1	gbt_macad8_consistent (internal, macaddr8, int2, oid, internal),
-	FUNCTION	2	gbt_macad8_union (internal, internal),
-	FUNCTION	3	gbt_macad8_compress (internal),
-	FUNCTION	4	gbt_decompress (internal),
-	FUNCTION	5	gbt_macad8_penalty (internal, internal, internal),
-	FUNCTION	6	gbt_macad8_picksplit (internal, internal),
-	FUNCTION	7	gbt_macad8_same (gbtreekey16, gbtreekey16, internal),
-	STORAGE		gbtreekey16;
-
-ALTER OPERATOR FAMILY gist_macaddr8_ops USING gist ADD
-	OPERATOR	6	<> (macaddr8, macaddr8) ,
-	FUNCTION	9 (macaddr8, macaddr8) gbt_macad8_fetch (internal);
diff --git a/pg_gist_hamming--1.4--1.5.sql b/pg_gist_hamming--1.4--1.5.sql
@@ -2,68 +2,3 @@
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "ALTER EXTENSION pg_gist_hamming UPDATE TO '1.5'" to load this file. \quit
-
---
---
---
--- enum ops
---
---
---
--- define the GiST support methods
-CREATE FUNCTION gbt_enum_consistent(internal,anyenum,int2,oid,internal)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_enum_compress(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_enum_fetch(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_enum_penalty(internal,internal,internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_enum_picksplit(internal, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_enum_union(internal, internal)
-RETURNS gbtreekey8
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
-CREATE FUNCTION gbt_enum_same(gbtreekey8, gbtreekey8, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT;
-
--- Create the operator class
-CREATE OPERATOR CLASS gist_enum_ops
-DEFAULT FOR TYPE anyenum USING gist
-AS
-	OPERATOR	1	<  ,
-	OPERATOR	2	<= ,
-	OPERATOR	3	=  ,
-	OPERATOR	4	>= ,
-	OPERATOR	5	>  ,
-	FUNCTION	1	gbt_enum_consistent (internal, anyenum, int2, oid, internal),
-	FUNCTION	2	gbt_enum_union (internal, internal),
-	FUNCTION	3	gbt_enum_compress (internal),
-	FUNCTION	4	gbt_decompress (internal),
-	FUNCTION	5	gbt_enum_penalty (internal, internal, internal),
-	FUNCTION	6	gbt_enum_picksplit (internal, internal),
-	FUNCTION	7	gbt_enum_same (gbtreekey8, gbtreekey8, internal),
-	STORAGE		gbtreekey8;
-
-ALTER OPERATOR FAMILY gist_enum_ops USING gist ADD
-	OPERATOR	6	<> (anyenum, anyenum) ,
-	FUNCTION	9 (anyenum, anyenum) gbt_enum_fetch (internal) ;
diff --git a/sql/bit.sql b/sql/bit.sql
diff --git a/sql/bytea.sql b/sql/bytea.sql
diff --git a/sql/cash.sql b/sql/cash.sql
diff --git a/sql/char.sql b/sql/char.sql
diff --git a/sql/cidr.sql b/sql/cidr.sql
diff --git a/sql/date.sql b/sql/date.sql
diff --git a/sql/enum.sql b/sql/enum.sql
diff --git a/sql/float4.sql b/sql/float4.sql
diff --git a/sql/float8.sql b/sql/float8.sql
diff --git a/sql/inet.sql b/sql/inet.sql
diff --git a/sql/int2.sql b/sql/int2.sql
diff --git a/sql/int4.sql b/sql/int4.sql
diff --git a/sql/interval.sql b/sql/interval.sql
diff --git a/sql/macaddr.sql b/sql/macaddr.sql
diff --git a/sql/macaddr8.sql b/sql/macaddr8.sql
diff --git a/sql/numeric.sql b/sql/numeric.sql
diff --git a/sql/oid.sql b/sql/oid.sql
diff --git a/sql/text.sql b/sql/text.sql
diff --git a/sql/time.sql b/sql/time.sql
diff --git a/sql/timestamp.sql b/sql/timestamp.sql
diff --git a/sql/timestamptz.sql b/sql/timestamptz.sql
diff --git a/sql/timetz.sql b/sql/timetz.sql
diff --git a/sql/uuid.sql b/sql/uuid.sql
diff --git a/sql/varbit.sql b/sql/varbit.sql
diff --git a/sql/varchar.sql b/sql/varchar.sql