diff --git a/usr.bin/xlint/lint1/debug.c b/usr.bin/xlint/lint1/debug.c
index ab796ba01ee6..fd9eea58e9a1 100644
--- a/usr.bin/xlint/lint1/debug.c
+++ b/usr.bin/xlint/lint1/debug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.25 2023/01/21 13:07:22 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.26 2023/03/28 15:52:50 rillig Exp $ */
 
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.25 2023/01/21 13:07:22 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.26 2023/03/28 15:52:50 rillig Exp $");
 #endif
 
 #include <stdlib.h>
@@ -393,30 +393,18 @@ debug_dinfo(const dinfo_t *d) // NOLINT(misc-no-recursion)
 	if (d->d_sou_align_in_bits != 0)
 		debug_printf(" align=%u", (unsigned)d->d_sou_align_in_bits);
 
-	if (d->d_const)
-		debug_printf(" const");
-	if (d->d_volatile)
-		debug_printf(" volatile");
-	if (d->d_inline)
-		debug_printf(" inline");
-	if (d->d_multiple_storage_classes)
-		debug_printf(" multiple_storage_classes");
-	if (d->d_invalid_type_combination)
-		debug_printf(" invalid_type_combination");
-	if (d->d_nonempty_decl)
-		debug_printf(" nonempty_decl");
-	if (d->d_vararg)
-		debug_printf(" vararg");
-	if (d->d_proto)
-		debug_printf(" prototype");
-	if (d->d_notyp)
-		debug_printf(" no_type_specifier");
-	if (d->d_asm)
-		debug_printf(" asm");
-	if (d->d_packed)
-		debug_printf(" packed");
-	if (d->d_used)
-		debug_printf(" used");
+	debug_word(d->d_const, "const");
+	debug_word(d->d_volatile, "volatile");
+	debug_word(d->d_inline, "inline");
+	debug_word(d->d_multiple_storage_classes, "multiple_storage_classes");
+	debug_word(d->d_invalid_type_combination, "invalid_type_combination");
+	debug_word(d->d_nonempty_decl, "nonempty_decl");
+	debug_word(d->d_vararg, "vararg");
+	debug_word(d->d_proto, "prototype");
+	debug_word(d->d_notyp, "no_type_specifier");
+	debug_word(d->d_asm, "asm");
+	debug_word(d->d_packed, "packed");
+	debug_word(d->d_used, "used");
 
 	if (d->d_tagtyp != NULL)
 		debug_printf(" tagtyp='%s'", type_name(d->d_tagtyp));