diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 97685a11..eac92c28 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2328,7 +2328,7 @@ void PathSearch::PlayerCover(Player *pPlayer)
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
 
-        if (!node || !(node->nodeflags & AI_COVERFLAGS)) {
+        if (!node || !(node->nodeflags & AI_MOVE_MASK)) {
             continue;
         }
 
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 481ee42f..1b86d7c0 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -141,17 +141,10 @@ typedef enum {
 // Added in 2.0
 #define AI_LOW_WALL_ARC 256
 
-#define AI_COVERFLAGS \
-    (AI_CRATE | AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_COVER | AI_LOW_WALL_ARC)
-#define AI_COVERFLAGS2       (AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT)
-#define AI_COVERFLAGS3       (AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_DUCK | AI_CONCEALMENT)
-#define AI_SNIPERFLAGS       (AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_COVER)
-#define AI_CRATEFLAGS        (AI_CRATE | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CONCEALMENT | AI_COVER | AI_DUCK)
-#define AI_COVER_LEFT_FLAGS  (AI_CRATE | AI_SNIPER | AI_CORNER_LEFT | AI_CONCEALMENT | AI_DUCK)
-#define AI_COVER_RIGHT_FLAGS (AI_CRATE | AI_SNIPER | AI_CORNER_RIGHT | AI_CONCEALMENT | AI_DUCK)
-#define AI_COVER_MASK        (AI_CRATE | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_COVER)
-#define AI_CONCEALMENT_MASK  (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
-#define AI_ALL               (AI_DUCK | AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE)
+#define AI_MOVE_MASK \
+    (AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE | AI_LOW_WALL_ARC)
+#define AI_COVER_MASK       (AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
+#define AI_CONCEALMENT_MASK (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
 
 void DrawNode(int iNodeCount);
 void DrawAllConnections(void);