diff --git a/stepmania/src/GameLoop.cpp b/stepmania/src/GameLoop.cpp
index 9ece0fde2a..594fc3d47a 100644
--- a/stepmania/src/GameLoop.cpp
+++ b/stepmania/src/GameLoop.cpp
@@ -22,7 +22,6 @@
 #include "RageTimer.h"
 #include "RageInput.h"
 
-static bool g_bQuitting = false;
 static RageTimer g_GameplayTimer;
 
 enum BoostAppPriority { BOOST_NO, BOOST_YES, BOOST_AUTO };	/* auto = do whatever is appropriate for the arch. */
@@ -32,11 +31,6 @@ static Preference<BoostAppPriority,int> g_BoostAppPriority( "BoostAppPriority",
  * animation jumps on frame skips.  0 to disable. */
 static Preference<float> g_fConstantUpdateDeltaSeconds( "ConstantUpdateDeltaSeconds", 0 );
 
-static bool UserQuit()
-{
-	return g_bQuitting || ArchHooks::UserQuit();
-}
-
 void HandleInputEvents( float fDeltaTime );
 
 static float g_fUpdateRate = 1;
@@ -128,7 +122,7 @@ void GameLoop::RunGameLoop()
 	if( ChangeAppPri() )
 		HOOKS->BoostPriority();
 
-	while( !UserQuit() )
+	while( !ArchHooks::UserQuit() )
 	{
 		/*
 		 * Update