Index: src/backend/commands/tablecmds.c
===================================================================
--- src/backend/commands/tablecmds.c	(HEAD)
+++ src/backend/commands/tablecmds.c	(modified)
@@ -1800,8 +1800,7 @@
 		 * line; so does trigger.c ...
 		 */
 		tgnargs = pg_trigger->tgnargs;
-		val = (bytea *)
-			DatumGetPointer(fastgetattr(tuple,
+		val = DatumGetByteaP(fastgetattr(tuple,
 										Anum_pg_trigger_tgargs,
 										tgrel->rd_att, &isnull));
 		if (isnull || tgnargs < RI_FIRST_ATTNAME_ARGNO ||
Index: src/backend/commands/trigger.c
===================================================================
--- src/backend/commands/trigger.c	(HEAD)
+++ src/backend/commands/trigger.c	(modified)
@@ -906,8 +906,7 @@
 			char	   *p;
 			int			i;
 
-			val = (bytea *)
-				DatumGetPointer(fastgetattr(htup,
+			val = DatumGetByteaP(fastgetattr(htup,
 											Anum_pg_trigger_tgargs,
 											tgrel->rd_att, &isnull));
 			if (isnull)
Index: src/backend/utils/adt/ruleutils.c
===================================================================
--- src/backend/utils/adt/ruleutils.c	(HEAD)
+++ src/backend/utils/adt/ruleutils.c	(modified)
@@ -521,8 +521,7 @@
 		char	   *p;
 		int			i;
 
-		val = (bytea *)
-			DatumGetPointer(fastgetattr(ht_trig,
+		val = DatumGetByteaP(fastgetattr(ht_trig,
 										Anum_pg_trigger_tgargs,
 										tgrel->rd_att, &isnull));
 		if (isnull)