diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp
index 73de948491..8de1ee33b9 100644
--- a/stepmania/src/CatalogXml.cpp
+++ b/stepmania/src/CatalogXml.cpp
@@ -83,7 +83,7 @@ void CatalogXml::Save( LoadingWindow *loading_window )
 			FOREACH_CONST( StepsType, vStepsTypesToShow, st )
 			{
 				XNode* p3 = p2->AppendChild( "StepsType" );
-				p3->AppendAttr( "StepsType", GAMEMAN->GetStepsTypeInfo(*st).szName );
+				p3->AppendAttr( "StepsType", GameManager::GetStepsTypeInfo(*st).szName );
 				
 				int iNumStepsInGroupAndStepsType[NUM_Difficulty];
 				ZERO( iNumStepsInGroupAndStepsType );
@@ -297,8 +297,8 @@ void CatalogXml::Save( LoadingWindow *loading_window )
 			XNode* pNode2 = pNode->AppendChild( "StepsType" );
 			FOREACH_CONST( StepsType, vStepsTypesToShow, iter )
 			{
-				XNode* pNode3 = pNode2->AppendChild( "StepsType", GAMEMAN->GetStepsTypeInfo(*iter).szName );
-				pNode3->AppendAttr( "DisplayAs", GAMEMAN->GetStepsTypeInfo(*iter).GetLocalizedString() );
+				XNode* pNode3 = pNode2->AppendChild( "StepsType", GameManager::GetStepsTypeInfo(*iter).szName );
+				pNode3->AppendAttr( "DisplayAs", GameManager::GetStepsTypeInfo(*iter).GetLocalizedString() );
 			}
 		}
 
diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 8ad6638d04..4d10d4da8d 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -387,7 +387,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 
 		// fall through
 	case ROW_STEPS_TYPE:
-		m_textValue[ROW_STEPS_TYPE].SetText( GAMEMAN->GetStepsTypeInfo(GetSelectedStepsType()).GetLocalizedString() );
+		m_textValue[ROW_STEPS_TYPE].SetText( GameManager::GetStepsTypeInfo(GetSelectedStepsType()).GetLocalizedString() );
 
 		{
 			Difficulty dcOld = Difficulty_Invalid;
@@ -501,7 +501,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 	case ROW_SOURCE_STEPS_TYPE:
 		m_textLabel[ROW_SOURCE_STEPS_TYPE].SetVisible( GetSelectedSteps() ? false : true );
 		m_textValue[ROW_SOURCE_STEPS_TYPE].SetVisible( GetSelectedSteps() ? false : true );
-		m_textValue[ROW_SOURCE_STEPS_TYPE].SetText( GAMEMAN->GetStepsTypeInfo(GetSelectedSourceStepsType()).GetLocalizedString() );
+		m_textValue[ROW_SOURCE_STEPS_TYPE].SetText( GameManager::GetStepsTypeInfo(GetSelectedSourceStepsType()).GetLocalizedString() );
 
 		m_vpSourceSteps.clear();
 		m_vpSourceSteps.push_back( StepsAndDifficulty(NULL,Difficulty_Invalid) );	// "blank"
diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 9904a880b7..68f5983fc6 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -45,7 +45,7 @@ LuaXType( RadarCategory );
 
 RString StepsTypeToString( StepsType st )
 {
-	RString s = GAMEMAN->GetStepsTypeInfo( st ).szName;
+	RString s = GameManager::GetStepsTypeInfo( st ).szName;
 	/* foo-bar -> Foo_Bar */
 	s.Replace('-','_');
 	for( size_t i = 0; i < s.size(); ++i )
diff --git a/stepmania/src/GameManager.h b/stepmania/src/GameManager.h
index 0988f1ea58..9594dd433b 100644
--- a/stepmania/src/GameManager.h
+++ b/stepmania/src/GameManager.h
@@ -40,7 +40,7 @@ public:
 	int GetIndexFromGame( const Game* pGame ) const;
 	const Game* GetGameFromIndex( int index ) const;
 
-	const StepsTypeInfo &GetStepsTypeInfo( StepsType st ) const;
+	static const StepsTypeInfo &GetStepsTypeInfo( StepsType st );
 	static StepsType StringToStepsType( RString sStepsType );
 	static const Game* StringToGameType( RString sGameType );
 	const Style* GameAndStringToStyle( const Game* pGame, RString sStyle );
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 9432e45bb9..99b975e76e 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -613,7 +613,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
 	}
 
 
-	int iNumNewTracks = GAMEMAN->GetStepsTypeInfo( out.m_StepsType ).iNumTracks;
+	int iNumNewTracks = GameManager::GetStepsTypeInfo( out.m_StepsType ).iNumTracks;
 	vector<int> iTransformNewToOld;
 	iTransformNewToOld.resize( iNumNewTracks, -1 );
 
diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp
index 3340a8829a..6082e60400 100644
--- a/stepmania/src/NotesWriterSM.cpp
+++ b/stepmania/src/NotesWriterSM.cpp
@@ -190,9 +190,9 @@ static RString GetSMNotesTag( const Song &song, const Steps &in, bool bSavingCac
 	lines.push_back( "" );
 	// Escape to prevent some clown from making a comment of "\r\n;"
 	lines.push_back( ssprintf("//---------------%s - %s----------------",
-		GAMEMAN->GetStepsTypeInfo(in.m_StepsType).szName, SmEscape(in.GetDescription()).c_str()) );
+		GameManager::GetStepsTypeInfo(in.m_StepsType).szName, SmEscape(in.GetDescription()).c_str()) );
 	lines.push_back( song.m_vsKeysoundFile.empty() ? "#NOTES:" : "#NOTES2:" );
-	lines.push_back( ssprintf( "     %s:", GAMEMAN->GetStepsTypeInfo(in.m_StepsType).szName ) );
+	lines.push_back( ssprintf( "     %s:", GameManager::GetStepsTypeInfo(in.m_StepsType).szName ) );
 	lines.push_back( ssprintf( "     %s:", SmEscape(in.GetDescription()).c_str() ) );
 	lines.push_back( ssprintf( "     %s:", DifficultyToString(in.GetDifficulty()).c_str() ) );
 	lines.push_back( ssprintf( "     %d:", in.GetMeter() ) );
diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index 1499e9c2d1..b7bfbc0dee 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -1197,7 +1197,7 @@ public:
 		m_Def.m_vsChoices.clear();
 		FOREACH_CONST( StepsType, m_vStepsTypesToShow, st )
 		{
-			RString s = GAMEMAN->GetStepsTypeInfo( *st ).GetLocalizedString();
+			RString s = GameManager::GetStepsTypeInfo( *st ).GetLocalizedString();
 			m_Def.m_vsChoices.push_back( s );
 		}
 
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 7e08e3d53f..8b0903f60b 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -1066,7 +1066,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const
 	pGeneralDataNode->AppendChild( "LastDifficulty",		DifficultyToString(m_LastDifficulty) );
 	pGeneralDataNode->AppendChild( "LastCourseDifficulty",		DifficultyToString(m_LastCourseDifficulty) );
 	if( m_LastStepsType != StepsType_Invalid )
-		pGeneralDataNode->AppendChild( "LastStepsType",			GAMEMAN->GetStepsTypeInfo(m_LastStepsType).szName );
+		pGeneralDataNode->AppendChild( "LastStepsType",			GameManager::GetStepsTypeInfo(m_LastStepsType).szName );
 	pGeneralDataNode->AppendChild( m_lastSong.CreateNode() );
 	pGeneralDataNode->AppendChild( m_lastCourse.CreateNode() );
 	pGeneralDataNode->AppendChild( "TotalPlays",			m_iTotalPlays );
@@ -1577,7 +1577,7 @@ XNode* Profile::SaveCategoryScoresCreateNode() const
 			continue;
 
 		XNode* pStepsTypeNode = pNode->AppendChild( "StepsType" );
-		pStepsTypeNode->AppendAttr( "Type", GAMEMAN->GetStepsTypeInfo(st).szName );
+		pStepsTypeNode->AppendAttr( "Type", GameManager::GetStepsTypeInfo(st).szName );
 
 		FOREACH_ENUM( RankingCategory,rc )
 		{
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 7ab5c8d683..80a85668c0 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1494,7 +1494,7 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
 
 			RString s = ssprintf(
 				SWITCHED_TO.GetValue() + " %s %s '%s' (%d of %d)",
-				GAMEMAN->GetStepsTypeInfo( pSteps->m_StepsType ).szName,
+				GameManager::GetStepsTypeInfo( pSteps->m_StepsType ).szName,
 				DifficultyToString( pSteps->GetDifficulty() ).c_str(),
 				pSteps->GetDescription().c_str(),
 				it - vSteps.begin() + 1,
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 7ea8bd3bee..e090f18405 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1285,7 +1285,7 @@ void ScreenGameplay::LoadLights()
 		/* fall through */
 	}
 
-	NoteDataUtil::LoadTransformedLights( TapNoteData1, m_CabinetLightsNoteData, GAMEMAN->GetStepsTypeInfo(STEPS_TYPE_LIGHTS_CABINET).iNumTracks );
+	NoteDataUtil::LoadTransformedLights( TapNoteData1, m_CabinetLightsNoteData, GameManager::GetStepsTypeInfo(STEPS_TYPE_LIGHTS_CABINET).iNumTracks );
 }
 
 void ScreenGameplay::StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMusic )
diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp
index 3c1b6ea887..de5e9bad10 100644
--- a/stepmania/src/ScreenOptionsManageCourses.cpp
+++ b/stepmania/src/ScreenOptionsManageCourses.cpp
@@ -60,7 +60,7 @@ static void SetNextCombination()
 	GAMESTATE->m_stEdit.Set( curVal.st );
 	GAMESTATE->m_cdEdit.Set( curVal.cd );
 	// XXX Testing.
-	SCREENMAN->SystemMessage( ssprintf("%s, %s", GAMEMAN->GetStepsTypeInfo(curVal.st).szName, DifficultyToString(curVal.cd).c_str()) );
+	SCREENMAN->SystemMessage( ssprintf("%s, %s", GameManager::GetStepsTypeInfo(curVal.st).szName, DifficultyToString(curVal.cd).c_str()) );
 
 	RefreshTrail();
 }
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp
index 8d672db8f4..8b0aebf5a4 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.cpp
+++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp
@@ -93,7 +93,7 @@ void ScreenOptionsManageEditSteps::BeginScreen()
 		def.m_sExplanationName = "Select Edit Steps";
 		def.m_vsChoices.clear();
 		StepsType st = (*s)->m_StepsType;
-		RString sType = GAMEMAN->GetStepsTypeInfo(st).GetLocalizedString();
+		RString sType = GameManager::GetStepsTypeInfo(st).GetLocalizedString();
 		def.m_vsChoices.push_back( sType );
 		def.m_bAllowThemeItems = false;	// already themed
 		iIndex++;
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index ef934f8561..e2c67e8cc6 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -186,7 +186,7 @@ float ScreenRanking::SetPage( const PageToShow &pts )
 	// init page
 	//
 	StepsType st = pts.aTypes.front().second;
-	m_textStepsType.SetText( GAMEMAN->GetStepsTypeInfo(st).GetLocalizedString() );
+	m_textStepsType.SetText( GameManager::GetStepsTypeInfo(st).GetLocalizedString() );
 
 	return 0;
 }
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index a8994241af..96da894424 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -917,11 +917,11 @@ void Song::AddAutoGenNotes()
 		/* If m_bAutogenSteps is disabled, only autogen lights. */
 		if( !PREFSMAN->m_bAutogenSteps && stMissing != STEPS_TYPE_LIGHTS_CABINET )
 			continue;
-		if( !GAMEMAN->GetStepsTypeInfo(stMissing).bAllowAutogen )
+		if( !GameManager::GetStepsTypeInfo(stMissing).bAllowAutogen )
 			continue;
 
 		// missing Steps of this type
-		int iNumTracksOfMissing = GAMEMAN->GetStepsTypeInfo(stMissing).iNumTracks;
+		int iNumTracksOfMissing = GameManager::GetStepsTypeInfo(stMissing).iNumTracks;
 
 		// look for closest match
 		StepsType stBestMatch = StepsType_Invalid;
@@ -933,7 +933,7 @@ void Song::AddAutoGenNotes()
 				continue;
 
 			/* has (non-autogen) Steps of this type */
-			const int iNumTracks = GAMEMAN->GetStepsTypeInfo(st).iNumTracks;
+			const int iNumTracks = GameManager::GetStepsTypeInfo(st).iNumTracks;
 			const int iTrackDifference = abs(iNumTracks-iNumTracksOfMissing);
 			if( iTrackDifference < iBestTrackDifference )
 			{
diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp
index 768f2b9b95..a0510169f6 100644
--- a/stepmania/src/Steps.cpp
+++ b/stepmania/src/Steps.cpp
@@ -63,7 +63,7 @@ unsigned Steps::GetHash() const
 
 void Steps::SetNoteData( const NoteData& noteDataNew )
 {
-	ASSERT( noteDataNew.GetNumTracks() == GAMEMAN->GetStepsTypeInfo(m_StepsType).iNumTracks );
+	ASSERT( noteDataNew.GetNumTracks() == GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks );
 
 	DeAutogen( false );
 
@@ -86,7 +86,7 @@ void Steps::GetNoteData( NoteData& noteDataOut ) const
 	else
 	{
 		noteDataOut.ClearAll();
-		noteDataOut.SetNumTracks( GAMEMAN->GetStepsTypeInfo(m_StepsType).iNumTracks );
+		noteDataOut.SetNumTracks( GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks );
 	}
 }
 
@@ -214,7 +214,7 @@ void Steps::Decompress() const
 
 		m_bNoteDataIsFilled = true;
 
-		int iNewTracks = GAMEMAN->GetStepsTypeInfo(m_StepsType).iNumTracks;
+		int iNewTracks = GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks;
 
 		if( this->m_StepsType == STEPS_TYPE_LIGHTS_CABINET )
 		{
@@ -267,7 +267,7 @@ void Steps::Decompress() const
 		// load from compressed
 		bool bComposite = m_StepsType == STEPS_TYPE_DANCE_ROUTINE;
 		m_bNoteDataIsFilled = true;
-		m_pNoteData->SetNumTracks( GAMEMAN->GetStepsTypeInfo(m_StepsType).iNumTracks );
+		m_pNoteData->SetNumTracks( GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks );
 
 		NoteDataUtil::LoadFromSMNoteDataString( *m_pNoteData, m_sNoteDataCompressed, bComposite );
 	}
@@ -352,7 +352,7 @@ void Steps::CopyFrom( Steps* pSource, StepsType ntTo, float fMusicLengthSeconds
 	m_StepsType = ntTo;
 	NoteData noteData;
 	pSource->GetNoteData( noteData );
-	noteData.SetNumTracks( GAMEMAN->GetStepsTypeInfo(ntTo).iNumTracks );
+	noteData.SetNumTracks( GameManager::GetStepsTypeInfo(ntTo).iNumTracks );
 	parent = NULL;
 	this->SetNoteData( noteData );
 	this->SetDescription( pSource->GetDescription() );
@@ -365,7 +365,7 @@ void Steps::CreateBlank( StepsType ntTo )
 {
 	m_StepsType = ntTo;
 	NoteData noteData;
-	noteData.SetNumTracks( GAMEMAN->GetStepsTypeInfo(ntTo).iNumTracks );
+	noteData.SetNumTracks( GameManager::GetStepsTypeInfo(ntTo).iNumTracks );
 	this->SetNoteData( noteData );
 }
 
diff --git a/stepmania/src/StepsUtil.cpp b/stepmania/src/StepsUtil.cpp
index b01c5e6f20..13b99f2365 100644
--- a/stepmania/src/StepsUtil.cpp
+++ b/stepmania/src/StepsUtil.cpp
@@ -280,7 +280,7 @@ XNode* StepsID::CreateNode() const
 {
 	XNode* pNode = new XNode( "Steps" );
 
-	pNode->AppendAttr( "StepsType", GAMEMAN->GetStepsTypeInfo(st).szName );
+	pNode->AppendAttr( "StepsType", GameManager::GetStepsTypeInfo(st).szName );
 	pNode->AppendAttr( "Difficulty", DifficultyToString(dc) );
 	if( dc == Difficulty_Edit )
 	{
@@ -319,7 +319,7 @@ void StepsID::LoadFromNode( const XNode* pNode )
 
 RString StepsID::ToString() const
 {
-	RString s = GAMEMAN->GetStepsTypeInfo( st ).szName;
+	RString s = GameManager::GetStepsTypeInfo( st ).szName;
 	s += " " + DifficultyToString( dc );
 	if( dc == Difficulty_Edit )
 	{
diff --git a/stepmania/src/TrailUtil.cpp b/stepmania/src/TrailUtil.cpp
index 61a831f1da..fc9a2936cf 100644
--- a/stepmania/src/TrailUtil.cpp
+++ b/stepmania/src/TrailUtil.cpp
@@ -43,7 +43,7 @@ XNode* TrailID::CreateNode() const
 {
 	XNode* pNode = new XNode( "Trail" );
 
-	pNode->AppendAttr( "StepsType", GAMEMAN->GetStepsTypeInfo(st).szName );
+	pNode->AppendAttr( "StepsType", GameManager::GetStepsTypeInfo(st).szName );
 	pNode->AppendAttr( "CourseDifficulty", DifficultyToString(cd) );
 
 	return pNode;
@@ -65,7 +65,7 @@ void TrailID::LoadFromNode( const XNode* pNode )
 
 RString TrailID::ToString() const
 {
-	RString s = GAMEMAN->GetStepsTypeInfo(st).szName;
+	RString s = GameManager::GetStepsTypeInfo(st).szName;
 	s += " " + DifficultyToString( cd );
 	return s;
 }