diff --git a/include/display.h b/include/display.h
index a41321e54..021fd0d1c 100644
--- a/include/display.h
+++ b/include/display.h
@@ -250,9 +250,9 @@
         ((int) U_AP_TYPE == M_AP_NOTHING)                               \
         ? hero_glyph                                                    \
         : ((int) U_AP_TYPE == M_AP_FURNITURE)                           \
-          ? cmap_to_glyph((int) gy.youmonst.mappearance)                 \
+          ? cmap_to_glyph((int) gy.youmonst.mappearance)                \
           : ((int) U_AP_TYPE == M_AP_OBJECT)                            \
-            ? objnum_to_glyph((int) gy.youmonst.mappearance)             \
+            ? objnum_to_glyph((int) gy.youmonst.mappearance)            \
             /* else U_AP_TYPE == M_AP_MONSTER */                        \
             : monnum_to_glyph((int) gy.youmonst.mappearance, Ugender)))
 
diff --git a/include/rm.h b/include/rm.h
index 548c44c53..bba37b89e 100644
--- a/include/rm.h
+++ b/include/rm.h
@@ -431,16 +431,16 @@ typedef struct {
 #endif
 #ifdef EXTRA_SANITY_CHECKS
 #define place_worm_seg(m, x, y) \
-    do {                                                            \
-        if (gl.level.monsters[x][y] && gl.level.monsters[x][y] != m)  \
-            impossible("place_worm_seg over mon");                  \
+    do {                                                             \
+        if (gl.level.monsters[x][y] && gl.level.monsters[x][y] != m) \
+            impossible("place_worm_seg over mon");                   \
         gl.level.monsters[x][y] = m;                                 \
     } while(0)
 #define remove_monster(x, y) \
     do {                                                  \
-        if (!gl.level.monsters[x][y])                      \
+        if (!gl.level.monsters[x][y])                     \
             impossible("no monster to remove");           \
-        gl.level.monsters[x][y] = (struct monst *) 0;      \
+        gl.level.monsters[x][y] = (struct monst *) 0;     \
     } while(0)
 #else
 #define place_worm_seg(m, x, y) gl.level.monsters[x][y] = m