diff --git a/module/system/repl/command.scm b/module/system/repl/command.scm
index ebe374db9..a052b93e7 100644
--- a/module/system/repl/command.scm
+++ b/module/system/repl/command.scm
@@ -596,13 +596,13 @@ called, and its return value(s) when it returns."
   "traps
 Show the set of currently attached traps.
 
-Show the set of currently attached traps (breakpoints)."
+Show the set of currently attached traps (breakpoints and tracepoints)."
   (let ((traps (list-traps)))
     (if (null? traps)
-        (format #t "No traps enabled.~%")
+        (format #t "No traps set.~%")
         (for-each (lambda (idx name)
                     (format #t "  ~a: ~a~a~%"
-                            idx name
+                            idx (trap-name idx)
                             (if (trap-enabled? idx) "" " (disabled)")))
                   (map car traps) (map cdr traps)))))
 
diff --git a/module/system/vm/trap-state.scm b/module/system/vm/trap-state.scm
index 328471db1..d97895e51 100644
--- a/module/system/vm/trap-state.scm
+++ b/module/system/vm/trap-state.scm
@@ -157,10 +157,7 @@
             (set-vm-trace-level! (the-vm) 0))))))
 
 (define* (list-traps #:optional (trap-state (the-trap-state)))
-  (map (lambda (wrapper)
-         (cons (trap-wrapper-index wrapper)
-               (trap-wrapper-name wrapper)))
-       (trap-state-wrappers trap-state)))
+  (map trap-wrapper-index (trap-state-wrappers trap-state)))
 
 (define* (trap-name idx #:optional (trap-state (the-trap-state)))
   (and=> (wrapper-at-index trap-state idx)