diff --git a/forge-gui/res/cardsfolder/k/karplusan_hound.txt b/forge-gui/res/cardsfolder/k/karplusan_hound.txt
index 9d3c25e686b..02ae15d09e4 100644
--- a/forge-gui/res/cardsfolder/k/karplusan_hound.txt
+++ b/forge-gui/res/cardsfolder/k/karplusan_hound.txt
@@ -2,8 +2,7 @@ Name:Karplusan Hound
 ManaCost:3 R
 Types:Creature Dog
 PT:3/3
-T:Mode$ Attacks | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ DBDealDamage | TriggerDescription$ Whenever CARDNAME attacks, if you control a Chandra planeswalker, this creature deals 2 damage to any target.
+T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Planeswalker.Chandra+YouCtrl | Execute$ DBDealDamage | TriggerDescription$ Whenever CARDNAME attacks, if you control a Chandra planeswalker, this creature deals 2 damage to any target.
 SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | NumDmg$ 2 | TgtPrompt$ Select any target
-SVar:X:Count$Valid Planeswalker.Chandra+YouCtrl
 SVar:BuffedBy:Chandra
 Oracle:Whenever Karplusan Hound attacks, if you control a Chandra planeswalker, this creature deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/l/lifeline.txt b/forge-gui/res/cardsfolder/l/lifeline.txt
index 7d0a75cc6e5..97a22d2f9af 100644
--- a/forge-gui/res/cardsfolder/l/lifeline.txt
+++ b/forge-gui/res/cardsfolder/l/lifeline.txt
@@ -1,10 +1,9 @@
 Name:Lifeline
 ManaCost:5
 Types:Artifact
-T:Mode$ ChangesZone | ValidCard$ Card.Creature | Origin$ Battlefield | Destination$ Graveyard | CheckSVar$ LifelineX | Referneces$ LifelineX | Execute$ TrigLifelineDelay | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature dies, if another creature is on the battlefield, return the first card to the battlefield under its owner's control at the beginning of the next end step.
+T:Mode$ ChangesZone | ValidCard$ Card.Creature | Origin$ Battlefield | Destination$ Graveyard | IsPresent$ Creature | Execute$ TrigLifelineDelay | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature dies, if another creature is on the battlefield, return the first card to the battlefield under its owner's control at the beginning of the next end step.
 SVar:TrigLifelineDelay:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigLifelineReturn | TriggerDescription$ Return that creature to the battlefield. | RememberObjects$ TriggeredNewCardLKICopy
 SVar:TrigLifelineReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Battlefield
-SVar:LifelineX:Count$Valid Creature
 AI:RemoveDeck:Random
 SVar:NonStackingEffect:True
 Oracle:Whenever a creature dies, if another creature is on the battlefield, return the first card to the battlefield under its owner's control at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/l/lone_revenant.txt b/forge-gui/res/cardsfolder/l/lone_revenant.txt
index fade25b4bab..056e0353f5a 100644
--- a/forge-gui/res/cardsfolder/l/lone_revenant.txt
+++ b/forge-gui/res/cardsfolder/l/lone_revenant.txt
@@ -3,7 +3,6 @@ ManaCost:3 U U
 Types:Creature Spirit
 PT:4/4
 K:Hexproof
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | CheckSVar$ NumYouCtrl | SVarCompare$ EQ0 | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, if you control no other creatures, look at the top four cards of your library. Put one of them into your hand and the others on the bottom of your library in any order.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | IsPresent$ Creature.Other+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, if you control no other creatures, look at the top four cards of your library. Put one of them into your hand and the others on the bottom of your library in any order.
 SVar:TrigDig:DB$ Dig | DigNum$ 4
-SVar:NumYouCtrl:Count$Valid Creature.Other+YouCtrl
 Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\nWhenever Lone Revenant deals combat damage to a player, if you control no other creatures, look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/l/loyal_apprentice.txt b/forge-gui/res/cardsfolder/l/loyal_apprentice.txt
index 05a02b8a33b..cec67897c42 100644
--- a/forge-gui/res/cardsfolder/l/loyal_apprentice.txt
+++ b/forge-gui/res/cardsfolder/l/loyal_apprentice.txt
@@ -3,11 +3,10 @@ ManaCost:1 R
 Types:Creature Human Artificer
 PT:2/1
 K:Haste
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Lieutenant — At the beginning of combat on your turn, if you control your commander, create a 1/1 colorless Thopter artifact creature token with flying. That token gains haste until end of turn.
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | IsPresent$ Card.IsCommander+YouOwn+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Lieutenant — At the beginning of combat on your turn, if you control your commander, create a 1/1 colorless Thopter artifact creature token with flying. That token gains haste until end of turn.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_thopter_flying | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Card.IsCommander+YouOwn+YouCtrl
 DeckHas:Ability$Token
 DeckHints:Ability$Token
 Oracle:Haste\nLieutenant — At the beginning of combat on your turn, if you control your commander, create a 1/1 colorless Thopter artifact creature token with flying. That token gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/l/loyal_unicorn.txt b/forge-gui/res/cardsfolder/l/loyal_unicorn.txt
index d89e19d6dfb..0bf25b00f38 100644
--- a/forge-gui/res/cardsfolder/l/loyal_unicorn.txt
+++ b/forge-gui/res/cardsfolder/l/loyal_unicorn.txt
@@ -3,11 +3,10 @@ ManaCost:3 W
 Types:Creature Unicorn
 PT:3/4
 K:Vigilance
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ PreventEffect | TriggerDescription$ Lieutenant — At the beginning of combat on your turn, if you control your commander, prevent all combat damage that would be dealt to creatures you control this turn.
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | IsPresent$ Card.IsCommander+YouOwn+YouCtrl | TriggerZones$ Battlefield | Execute$ PreventEffect | TriggerDescription$ Lieutenant — At the beginning of combat on your turn, if you control your commander, prevent all combat damage that would be dealt to creatures you control this turn.
 SVar:PreventEffect:DB$ Effect | ReplacementEffects$ RPrevent | ValidTgts$ You | Description$ Prevent all combat damage that would be dealt to creatures you control this turn.
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | IsCombat$ True | ActiveZones$ Command | ValidTarget$ Creature.YouCtrl | Description$ Prevent all combat damage that would be dealt to creatures you control this turn.
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Vigilance | Description$ Other creatures you control gain vigilance until end of turn.
-SVar:X:Count$Valid Card.IsCommander+YouOwn+YouCtrl
 SVar:BuffedBy:Card.IsCommander
 AI:RemoveDeck:Random
 Oracle:Vigilance\nLieutenant — At the beginning of combat on your turn, if you control your commander, prevent all combat damage that would be dealt to creatures you control this turn. Other creatures you control gain vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sages_reverie.txt b/forge-gui/res/cardsfolder/s/sages_reverie.txt
index c79e7ca1a61..b6f452cc3b6 100644
--- a/forge-gui/res/cardsfolder/s/sages_reverie.txt
+++ b/forge-gui/res/cardsfolder/s/sages_reverie.txt
@@ -5,7 +5,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 3 W | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card for each aura you control that's attached to a creature.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Referneces$ X | Description$ Enchanted creature gets +1/+1 for each aura you control that's attached to a creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Description$ Enchanted creature gets +1/+1 for each aura you control that's attached to a creature.
 SVar:X:Count$Valid Aura.YouCtrl+AttachedTo Creature
 SVar:BuffedBy:Aura
 Oracle:Enchant creature\nWhen Sage's Reverie enters the battlefield, draw a card for each Aura you control that's attached to a creature.\nEnchanted creature gets +1/+1 for each Aura you control that's attached to a creature.
diff --git a/forge-gui/res/cardsfolder/s/skitterskin.txt b/forge-gui/res/cardsfolder/s/skitterskin.txt
index 352737a46f8..8558ffab9e8 100644
--- a/forge-gui/res/cardsfolder/s/skitterskin.txt
+++ b/forge-gui/res/cardsfolder/s/skitterskin.txt
@@ -4,7 +4,6 @@ Types:Creature Eldrazi Drone
 PT:4/3
 K:Devoid
 K:CARDNAME can't block.
-A:AB$ Regenerate | Cost$ 1 B | CheckSVar$ X | SVarCompare$ GE1 | SpellDescription$ Regenerate CARDNAME. Activate only if you control another colorless creature.
-SVar:X:Count$Valid Creature.Colorless+YouCtrl+Other
+A:AB$ Regenerate | Cost$ 1 B | IsPresent$ Creature.Colorless+YouCtrl+Other | SpellDescription$ Regenerate CARDNAME. Activate only if you control another colorless creature.
 DeckHints:Color$Colorless & Keyword$Devoid
 Oracle:Devoid (This card has no color.)\nSkitterskin can't block.\n{1}{B}: Regenerate Skitterskin. Activate only if you control another colorless creature.
diff --git a/forge-gui/res/cardsfolder/u/underhanded_designs.txt b/forge-gui/res/cardsfolder/u/underhanded_designs.txt
index 4c4f7b6606d..8a4030ddf41 100644
--- a/forge-gui/res/cardsfolder/u/underhanded_designs.txt
+++ b/forge-gui/res/cardsfolder/u/underhanded_designs.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever an artifact enters the battlefield under your control, you may pay {1}. If you do, each opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:AB$ LoseLife | Cost$ 1 | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-A:AB$ Destroy | Cost$ 1 B Sac<1/CARDNAME> | ValidTgts$ Creature | CheckSVar$ X | SVarCompare$ GE2 | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature. Activate only if you control two or more artifacts.
-SVar:X:Count$Valid Card.Artifact+YouCtrl
+A:AB$ Destroy | Cost$ 1 B Sac<1/CARDNAME> | ValidTgts$ Creature | IsPresent$ Card.Artifact+YouCtrl | PresentCompare$ GE2 | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature. Activate only if you control two or more artifacts.
 DeckHas:Ability$LifeGain
 Oracle:Whenever an artifact enters the battlefield under your control, you may pay {1}. If you do, each opponent loses 1 life and you gain 1 life.\n{1}{B}, Sacrifice Underhanded Designs: Destroy target creature. Activate only if you control two or more artifacts.