diff --git a/wadsrc/static/zscript/doom/bossbrain.txt b/wadsrc/static/zscript/doom/bossbrain.txt
index 9a2ad759c..cde600701 100644
--- a/wadsrc/static/zscript/doom/bossbrain.txt
+++ b/wadsrc/static/zscript/doom/bossbrain.txt
@@ -186,11 +186,11 @@ extend class Actor
 	void A_BrainDie()
 	{
 		// [RH] If noexit, then don't end the level.
-		if ((GetCVar("deathmatch") || GetCVar("alwaysapplydmflags")) && GetCVar("sv_noexit"))
+		if ((deathmatch || alwaysapplydmflags) && sv_noexit)
 			return;
 
 		// New dmflag: Kill all boss spawned monsters before ending the level.
-		if (GetCVar("sv_killbossmonst"))
+		if (sv_killbossmonst)
 		{
 			int count;	// Repeat until we have no more boss-spawned monsters.
 			ThinkerIterator it = ThinkerIterator.Create();
diff --git a/wadsrc/static/zscript/doom/doommisc.txt b/wadsrc/static/zscript/doom/doommisc.txt
index a11c411f8..7d4c9dec4 100644
--- a/wadsrc/static/zscript/doom/doommisc.txt
+++ b/wadsrc/static/zscript/doom/doommisc.txt
@@ -38,7 +38,7 @@ extend class Actor
 {
 	void A_BarrelDestroy()
 	{
-		if (GetCVar("sv_barrelrespawn"))
+		if (sv_barrelrespawn)
 		{
 			Height = Default.Height;
 			bInvisible = true;
diff --git a/wadsrc/static/zscript/doom/doomweapons.txt b/wadsrc/static/zscript/doom/doomweapons.txt
index 75f856218..731740ac6 100644
--- a/wadsrc/static/zscript/doom/doomweapons.txt
+++ b/wadsrc/static/zscript/doom/doomweapons.txt
@@ -41,7 +41,7 @@ extend class StateProvider
 			
 		}
 
-		int damage = GetCVar("deathmatch") ? 100 : 150;
+		int damage = deathmatch ? 100 : 150;
 		A_RailAttack(damage, offset_xy, false);	// note that this function handles ammo depletion itself for Dehacked compatibility purposes.
 	}
 
diff --git a/wadsrc/static/zscript/doom/fatso.txt b/wadsrc/static/zscript/doom/fatso.txt
index d1a456d16..59e0d4c63 100644
--- a/wadsrc/static/zscript/doom/fatso.txt
+++ b/wadsrc/static/zscript/doom/fatso.txt
@@ -192,7 +192,7 @@ extend class Actor
 		aimtarget.Height = Height;
 		
 		bool shootmode = ((flags & MSF_Classic) || // Flag explicitely set, or no flags and compat options
-					(flags == 0 && isDehState(CurState) && GetCVar("compat_mushroom")));
+					(flags == 0 && isDehState(CurState) && compat_mushroom));
 
 		for (i = -numspawns; i <= numspawns; i += 8)
 		{
diff --git a/wadsrc/static/zscript/doom/weaponbfg.txt b/wadsrc/static/zscript/doom/weaponbfg.txt
index 27f318daf..3543b9cdb 100644
--- a/wadsrc/static/zscript/doom/weaponbfg.txt
+++ b/wadsrc/static/zscript/doom/weaponbfg.txt
@@ -81,7 +81,7 @@ extend class StateProvider
 				return;
 		}
 
-		SpawnPlayerMissile("BFGBall", angle, 0, 0, 0, null, false, GetCVar("sv_nobfgaim"));
+		SpawnPlayerMissile("BFGBall", angle, 0, 0, 0, null, false, sv_nobfgaim);
 	}