diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index 8ea0a14d26..2f377d75a9 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -24,6 +24,7 @@
 #include "Profile.h"
 #include "SongManager.h"
 #include "GameLoop.h"
+#include "ScreenServiceAction.h"
 
 static bool g_bIsDisplayed = false;
 static bool g_bIsSlow = false;
@@ -609,8 +610,7 @@ class DebugLineClearMachineStats : public IDebugLine
 	virtual void Do( RString &sMessageOut )
 	{
 		GameCommand gc;
-		gc.Load( 0, ParseCommands("ClearMachineStats") );
-		gc.ApplyToAllPlayers();
+		ClearMachineStats();
 		IDebugLine::Do( sMessageOut );
 	}
 };
@@ -642,7 +642,7 @@ static HighScore MakeRandomHighScore( float fPercentDP )
 	return hs;
 }
 
-static void FillProfile( Profile *pProfile )
+static void FillProfileStats( Profile *pProfile )
 {
 	// Choose a percent for all scores.  This is useful for testing unlocks
 	// where some elements are unlocked at a certain percent complete
@@ -694,7 +694,7 @@ class DebugLineFillMachineStats : public IDebugLine
 	virtual void Do( RString &sMessageOut )
 	{
 		Profile* pProfile = PROFILEMAN->GetMachineProfile();
-		FillProfile( pProfile );
+		FillProfileStats( pProfile );
 		PROFILEMAN->SaveMachineProfile();
 		IDebugLine::Do( sMessageOut );
 	}
diff --git a/stepmania/src/ScreenServiceAction.cpp b/stepmania/src/ScreenServiceAction.cpp
index 98bbfb9e9b..3495ac9c74 100644
--- a/stepmania/src/ScreenServiceAction.cpp
+++ b/stepmania/src/ScreenServiceAction.cpp
@@ -25,7 +25,7 @@ static RString ClearBookkeepingData()
 }
 
 static LocalizedString MACHINE_STATS_CLEARED( "ScreenServiceAction", "Machine stats cleared." );
-static RString ClearMachineStats()
+RString ClearMachineStats()
 {
 	Profile* pProfile = PROFILEMAN->GetMachineProfile();
 	// don't reset the Guid
diff --git a/stepmania/src/ScreenServiceAction.h b/stepmania/src/ScreenServiceAction.h
index 0a19dc3e0c..121b1f2b76 100644
--- a/stepmania/src/ScreenServiceAction.h
+++ b/stepmania/src/ScreenServiceAction.h
@@ -8,6 +8,8 @@
 #undef FAILED
 #endif
 
+RString ClearMachineStats();
+
 #include "ScreenPrompt.h"
 
 class ScreenServiceAction : public ScreenPrompt