diff --git a/src/arch/arm/c_traps.c b/src/arch/arm/c_traps.c
index 450493253..740d00313 100644
--- a/src/arch/arm/c_traps.c
+++ b/src/arch/arm/c_traps.c
@@ -109,6 +109,9 @@ void NORETURN slowpath(syscall_t syscall)
         ksKernelEntry.path = Entry_UnknownSyscall;
         /* ksKernelEntry.word word is already set to syscall */
 #endif /* TRACK_KERNEL_ENTRIES */
+        /* Contrary to the name, this handles all non-standard syscalls used in
+         * debug builds also.
+         */
         handleUnknownSyscall(syscall);
     } else {
 #ifdef TRACK_KERNEL_ENTRIES
diff --git a/src/arch/riscv/c_traps.c b/src/arch/riscv/c_traps.c
index a93d9657c..ba647b36e 100644
--- a/src/arch/riscv/c_traps.c
+++ b/src/arch/riscv/c_traps.c
@@ -150,6 +150,9 @@ void VISIBLE NORETURN slowpath(syscall_t syscall)
 #ifdef TRACK_KERNEL_ENTRIES
         ksKernelEntry.path = Entry_UnknownSyscall;
 #endif /* TRACK_KERNEL_ENTRIES */
+        /* Contrary to the name, this handles all non-standard syscalls used in
+         * debug builds also.
+         */
         handleUnknownSyscall(syscall);
     } else {
 #ifdef TRACK_KERNEL_ENTRIES
diff --git a/src/arch/x86/c_traps.c b/src/arch/x86/c_traps.c
index 770e2c33d..56322dcfd 100644
--- a/src/arch/x86/c_traps.c
+++ b/src/arch/x86/c_traps.c
@@ -126,6 +126,9 @@ void NORETURN slowpath(syscall_t syscall)
         ksKernelEntry.path = Entry_UnknownSyscall;
         /* ksKernelEntry.word word is already set to syscall */
 #endif /* TRACK_KERNEL_ENTRIES */
+        /* Contrary to the name, this handles all non-standard syscalls used in
+         * debug builds also.
+         */
         handleUnknownSyscall(syscall);
     } else {
 #ifdef TRACK_KERNEL_ENTRIES