diff --git a/manifest.json b/manifest.json
index 06355a1..7e65457 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
     "author": [
         "Emik"
     ],
-    "version": "2.4.1",
+    "version": "2.4.2",
     "badge_colour": "8BE9FD",
     "main_file": "src/main.lua",
     "badge_text_colour": "44475A",
diff --git a/src/blind.lua b/src/blind.lua
index 8bb2157..775d863 100644
--- a/src/blind.lua
+++ b/src/blind.lua
@@ -32,9 +32,7 @@ local function common_rank()
     ---@type { [integer]: integer }, { [integer]: string }
     local tally, to_name = {}, {}
 
-    f(G.playing_cards):where(function(v)
-        return not SMODS.has_no_rank(v)
-    end):each(function(v)
+    f(G.playing_cards):where(SMODS.has_no_rank, false):each(function(v)
         local id = v:get_id()
         to_name[id] = v.base.value
         tally[id] = (tally[id] or 0) + 1
@@ -236,16 +234,17 @@ blind {
     boss_colour = HEX "102a41ff",
     pronouns = "it_its",
     defeat = function(self)
-        self.cards():each(set_freeze())
+        self.cards():where "Roland_blizzard":each(set_freeze())
         G.GAME.blind.disabled = true
     end,
     disable = function(self)
         self:defeat()
     end,
     calculate = function(self, b)
-        return not b.disabled and self.cards():where(function(v)
-            return not v.Roland_blizzard and v.facing == "front"
-        end):each(set_freeze(true)) or nil
+        return not b.disabled and self.cards()
+            :where("Roland_blizzard", false)
+            :where("facing", "front")
+            :each(set_freeze(true)) or nil
     end,
     cards = function()
         return f(G):where(function(v)
diff --git a/src/challenge.lua b/src/challenge.lua
index b72483a..3f9ab2a 100644
--- a/src/challenge.lua
+++ b/src/challenge.lua
@@ -198,9 +198,7 @@ local finalizers = {
                     local _ = v.debuff and SMODS.recalc_debuff(v)
                 end)
 
-                jokers = next(jokers) and jokers or f(cards):where(function(v)
-                    return not v.debuff
-                end):map(function(v)
+                jokers = next(jokers) and jokers or f(cards):where("debuff", false):map(function(v)
                     local _ = not prev[v] and table.insert(jokers, v)
                     return v
                 end):table()