diff --git a/data/core/macros/abilities.cfg b/data/core/macros/abilities.cfg
index 272fe8b69af..b2935ca0f5d 100644
--- a/data/core/macros/abilities.cfg
+++ b/data/core/macros/abilities.cfg
@@ -495,11 +495,7 @@ Enemy units cannot see this unit while it is in deep water, except if they have
 
     [filter]
         [not]
-            [filter_wml]
-                [status]
-                    unplagueable="yes"
-                [/status]
-            [/filter_wml]
+            status=unplagueable
         [/not]
     [/filter]
 
diff --git a/data/core/macros/animation-utils.cfg b/data/core/macros/animation-utils.cfg
index 0c28dff0283..86e467c9b97 100644
--- a/data/core/macros/animation-utils.cfg
+++ b/data/core/macros/animation-utils.cfg
@@ -220,11 +220,7 @@
     # Poisoned units should have no idle animation.
     [filter]
         [not]
-            [filter_wml]
-                [status]
-                    poisoned="yes"
-                [/status]
-            [/filter_wml]
+            status=poisoned
         [/not]
     [/filter]
     # Units next to enemies should not have idle animations
diff --git a/data/core/macros/sound-utils.cfg b/data/core/macros/sound-utils.cfg
index 25fc46b418b..1c922412d74 100644
--- a/data/core/macros/sound-utils.cfg
+++ b/data/core/macros/sound-utils.cfg
@@ -844,11 +844,7 @@ zombie-hit-[1~6].ogg #enddef
         hits=hit
         [filter_second]
             [not]
-                [filter_wml]
-                    [status]
-                        slowed="yes"
-                    [/status]
-                [/filter_wml]
+                status=slowed
             [/not]
         [/filter_second]
 
@@ -866,18 +862,7 @@ zombie-hit-[1~6].ogg #enddef
         hits=hit
         [filter_second]
             [not]
-                [filter_wml]
-                    [status]
-                        poisoned="yes"
-                    [/status]
-                [/filter_wml]
-                [or]
-                    [filter_wml]
-                        [status]
-                            unpoisonable="yes"
-                        [/status]
-                    [/filter_wml]
-                [/or]
+                status=poisoned, unpoisonable
             [/not]
         [/filter_second]