diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index 4450f1db85..89e01d5d0b 100644
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -563,8 +563,8 @@ RString SongManager::GetCourseGroupBannerPath( const RString &sCourseGroup ) con
 
 void SongManager::GetCourseGroupNames( vector<RString> &AddTo ) const
 {
-	FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter )
-		AddTo.push_back( iter->first );
+	for (std::pair<RString const &, CourseGroupInfo &> const &iter : m_mapCourseGroupToInfo)
+		AddTo.push_back( iter.first );
 }
 
 bool SongManager::DoesCourseGroupExist( const RString &sCourseGroup ) const
@@ -575,9 +575,9 @@ bool SongManager::DoesCourseGroupExist( const RString &sCourseGroup ) const
 RageColor SongManager::GetCourseGroupColor( const RString &sCourseGroup ) const
 {
 	int iIndex = 0;
-	FOREACHM_CONST( RString, CourseGroupInfo, m_mapCourseGroupToInfo, iter )
+	for (std::pair<RString const &, CourseGroupInfo &> const &iter : m_mapCourseGroupToInfo)
 	{
-		if( iter->first == sCourseGroup )
+		if( iter.first == sCourseGroup )
 			return SONG_GROUP_COLOR.GetValue( iIndex%NUM_SONG_GROUP_COLORS );
 		iIndex++;
 	}