diff --git a/src/ckh.c b/src/ckh.c
index e58980de..2f38348b 100644
--- a/src/ckh.c
+++ b/src/ckh.c
@@ -418,9 +418,8 @@ ckh_delete(ckh_t *ckh)
 #endif
 
 	idalloc(ckh->tab);
-#ifdef JEMALLOC_DEBUG
-	memset(ckh, 0x5a, sizeof(ckh_t));
-#endif
+	if (config_debug)
+		memset(ckh, 0x5a, sizeof(ckh_t));
 }
 
 size_t
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 58e18df4..2d56e4aa 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -10,17 +10,8 @@ malloc_tsd_data(, thread_allocated, thread_allocated_t,
 
 /* Runtime configuration options. */
 const char	*je_malloc_conf;
-#ifdef JEMALLOC_DEBUG
-bool	opt_abort = true;
-#  ifdef JEMALLOC_FILL
-bool	opt_junk = true;
-#  else
-bool	opt_junk = false;
-#  endif
-#else
-bool	opt_abort = false;
-bool	opt_junk = false;
-#endif
+bool	opt_abort = config_debug;
+bool	opt_junk = (config_debug && config_fill);
 size_t	opt_quarantine = ZU(0);
 bool	opt_redzone = false;
 bool	opt_utrace = false;