diff --git a/src/pdumper.c b/src/pdumper.c
index 7708bc892f..0bc48aedbe 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -143,8 +143,6 @@ #define DUMP_OFF_MIN INT_LEAST32_MIN
 #define DUMP_OFF_MAX INT_LEAST32_MAX
 #define PRIdDUMP_OFF PRIdLEAST32
 
-enum { EMACS_INT_XDIGITS = (EMACS_INT_WIDTH + 3) / 4 };
-
 static void ATTRIBUTE_FORMAT_PRINTF (1, 2)
 dump_trace (const char *fmt, ...)
 {
@@ -1008,9 +1006,7 @@ dump_queue_enqueue (struct dump_queue *dump_queue,
   if (NILP (weights))
     {
       /* Object is new.  */
-      EMACS_UINT uobj = XLI (object);
-      dump_trace ("new object %0*"pI"x weight=%d\n", EMACS_INT_XDIGITS, uobj,
-		  weight.value);
+      dump_trace ("new object %p weight=%d\n", XLP (object), weight.value);
 
       if (weight.value == WEIGHT_NONE.value)
         {
@@ -1306,10 +1302,9 @@ dump_queue_dequeue (struct dump_queue *dump_queue, dump_off basis)
   else
     emacs_abort ();
 
-  EMACS_UINT uresult = XLI (result);
-  dump_trace ("  result score=%f src=%s object=%0*"pI"x\n",
+  dump_trace ("  result score=%f src=%s object=%p\n",
               best < 0 ? -1.0 : (double) candidates[best].score,
-	      src, EMACS_INT_XDIGITS, uresult);
+	      src, XLP (result));
 
   {
     Lisp_Object weights = Fgethash (result, dump_queue->link_weights, Qnil);