diff --git a/include/sym.h b/include/sym.h
index 05d566b07..44efaffe7 100644
--- a/include/sym.h
+++ b/include/sym.h
@@ -103,9 +103,8 @@ struct symsetentry {
 #define is_cmap_corr(i) ((i) >= S_corr && (i) <= S_litcorr)
 #define is_cmap_furniture(i) ((i) >= S_upstair && (i) <= S_fountain)
 #define is_cmap_water(i) ((i) == S_pool || (i) == S_water)
-#define is_cmap_lava(i) ((i) == S_lava)
-#define is_cmap_stairs(i) ((i) == S_upstair || (i) == S_dnstair || \
-                           (i) == S_upladder || (i) == S_dnladder)
+#define is_cmap_lava(i) ((i) == S_lava || (i) == S_lavawall)
+#define is_cmap_stairs(i) ((i) >= S_upstair && (i) <= S_brdnladder)
 
 /* misc symbol definitions */
 enum misc_symbols {