diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index a20788ab40..766aa2b0dc 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -301,7 +301,7 @@ int Profile::GetPossibleCourseDancePointsForStepsType( StepsType st ) const
 			if( !pCourse->AllSongsAreFixed() )
 				continue;
 
-			FOREACH_CourseDifficulty( cd )
+			FOREACH_ShownCourseDifficulty( cd )
 			{
 				if( !pCourse->HasCourseDifficulty(st,cd) )
 					continue;
@@ -338,7 +338,7 @@ int Profile::GetActualCourseDancePointsForStepsType( StepsType st ) const
 				continue;
 
 			const HighScoresForACourse& h = i->second;
-			FOREACH_CourseDifficulty( cd )
+			FOREACH_ShownCourseDifficulty( cd )
 			{
 				const HighScoreList& hs = h.hs[st][cd];
 				const RadarValues& fRadars = pCourse->GetRadarValues(st,cd);
diff --git a/stepmania/src/ProfileHtml.cpp b/stepmania/src/ProfileHtml.cpp
index 6bd2316399..1cd37702d1 100644
--- a/stepmania/src/ProfileHtml.cpp
+++ b/stepmania/src/ProfileHtml.cpp
@@ -721,7 +721,7 @@ bool PrintHighScoresForCourse( RageFile &f, const Profile *pProfile, Course* pCo
 
 	for( StepsType st=(StepsType)0; st<NUM_STEPS_TYPES; st=(StepsType)(st+1) )
 	{
-		FOREACH_CourseDifficulty( cd )
+		FOREACH_ShownCourseDifficulty( cd )
 		{
 			const HighScoreList &hsl = pProfile->GetCourseHighScoreList( pCourse, st, cd );
 			if( hsl.vHighScores.empty() )
@@ -843,7 +843,7 @@ bool PrintPercentCompleteForStepsType( RageFile &f, const Profile *pProfile, Ste
 
 			// table header row
 			TranslatedWrite(f, "<tr><td>&nbsp;</td>" );
-			FOREACH_CourseDifficulty( cd )
+			FOREACH_ShownCourseDifficulty( cd )
 			{
 				TranslatedWrite(f, ssprintf("<td>%s</td>", CourseDifficultyToThemedString(cd).c_str()) );
 			}
@@ -863,7 +863,7 @@ bool PrintPercentCompleteForStepsType( RageFile &f, const Profile *pProfile, Ste
 				TranslatedWrite(f, ssprintf("<p class='songtitle'>%s</p>", pCourse->m_sName.c_str()) );
 				TranslatedWrite(f, "</td>" );
 
-				FOREACH_CourseDifficulty( cd )
+				FOREACH_ShownCourseDifficulty( cd )
 				{
 					if( pCourse->HasCourseDifficulty(st,cd) )
 					{
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index b68ec0981e..02ba5a8d67 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -112,9 +112,8 @@ void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand )
 
 		Course* pCourse = GAMESTATE->m_pCurCourse;
 		StepsType st = GAMESTATE->GetCurrentStyleDef()->m_StepsType;
-		for( int d=0; d<NUM_COURSE_DIFFICULTIES; d++ )
+		FOREACH_ShownCourseDifficulty(cd)
 		{
-			CourseDifficulty cd = (CourseDifficulty)d;
 			if( !pCourse->HasCourseDifficulty(st,cd) )
 				continue;	// skip
 
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 6e537c4bef..2f4ba5b3af 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -225,7 +225,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 
 	{
 		// for all_courses:
-		FOREACH_CourseDifficulty(d)
+		FOREACH_ShownCourseDifficulty(d)
 		{
 			CString cd = CourseDifficultyToString(d);
 			m_sprCourseDifficulty[d].SetName( ssprintf("CourseDifficulty%s",cd.c_str()) );
@@ -255,7 +255,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 			pCourseScoreRowItem->m_textSongTitle.LoadFromFont( THEME->GetPathToF("ScreenRanking course list title") );
 			pCourseScoreRowItem->AddChild( &pCourseScoreRowItem->m_textSongTitle );
 
-			for( int d=0; d<NUM_COURSE_DIFFICULTIES; d++ )
+			FOREACH_ShownCourseDifficulty(d)
 			{
 				pCourseScoreRowItem->m_textStepsScore[d].SetName( "CourseListScore" );
 				pCourseScoreRowItem->m_textStepsScore[d].LoadFromFont( THEME->GetPathToF("ScreenRanking course list score") );
@@ -621,7 +621,7 @@ float ScreenRanking::SetPage( PageToShow pts )
 	}
 
 	{
-		for( int d=0; d<NUM_COURSE_DIFFICULTIES; d++ )
+		FOREACH_ShownCourseDifficulty(d)
 		{
 			m_sprCourseDifficulty[d].SetHidden( !bShowCourseDifficulty );
 			if( bShowCourseDifficulty )
@@ -656,7 +656,7 @@ float ScreenRanking::SetPage( PageToShow pts )
 				pCourseScoreRowItem->m_textSongTitle.SetUseZBuffer( true );
 				ON_COMMAND( pCourseScoreRowItem->m_textSongTitle );
 
-				for( int d=0; d<NUM_COURSE_DIFFICULTIES; d++ )
+				FOREACH_ShownCourseDifficulty(d)
 				{
 					pCourseScoreRowItem->m_textStepsScore[d].Reset();
 					pCourseScoreRowItem->m_textStepsScore[d].SetXY( COURSE_SCORE_OFFSET_X(d), COURSE_SCORE_OFFSET_Y );
@@ -821,7 +821,7 @@ float ScreenRanking::SetPage( PageToShow pts )
 				const Course* pCourse = pCourseScoreRowItem->m_pCourse;
 
 				pCourseScoreRowItem->m_textSongTitle.SetText( pCourse->m_sName );
-				FOREACH_CourseDifficulty( cd )
+				FOREACH_ShownCourseDifficulty( cd )
 				{
 					const HighScoreList &hsl = PROFILEMAN->GetMachineProfile()->GetCourseHighScoreList( pCourse, pts.nt, cd );
 					BitmapText* pTextStepsScore = &pCourseScoreRowItem->m_textStepsScore[cd];
@@ -875,7 +875,7 @@ void ScreenRanking::TweenPageOffScreen()
 		if( !m_sprDifficulty[*dc_iter].GetHidden() )
 			OFF_COMMAND( m_sprDifficulty[*dc_iter] );
 	}
-	for( int d=0; d<NUM_COURSE_DIFFICULTIES; d++ )
+	FOREACH_ShownCourseDifficulty(d)
 	{
 		if( !m_sprCourseDifficulty[d].GetHidden() )
 			OFF_COMMAND( m_sprCourseDifficulty[d] );