diff --git a/stepmania/src/GhostArrow.cpp b/stepmania/src/GhostArrow.cpp
index 5a44beac27..dfde057ccc 100644
--- a/stepmania/src/GhostArrow.cpp
+++ b/stepmania/src/GhostArrow.cpp
@@ -5,7 +5,7 @@
 
 GhostArrow::GhostArrow()
 {
-	for( int i=0; i<NUM_TAP_NOTE_SCORES; i++ )
+	FOREACH_TapNoteScore( i )
 	{
 		m_spr[i].SetHidden( true );
 		this->AddChild( &m_spr[i] );
@@ -14,9 +14,9 @@ GhostArrow::GhostArrow()
 
 void GhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement )
 {
-	for( int i=0; i<NUM_TAP_NOTE_SCORES; i++ )
+	FOREACH_TapNoteScore( i )
 	{
-		CString sJudge = TapNoteScoreToString( (TapNoteScore)i );
+		CString sJudge = TapNoteScoreToString( i );
 		
 		CString sFullElement = sElement  + " " + sJudge;
 
@@ -27,9 +27,9 @@ void GhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement )
 		m_spr[i].Load( sPath );
 	}
 
-	for( int i=0; i<NUM_TAP_NOTE_SCORES; i++ )
+	FOREACH_TapNoteScore( i )
 	{
-		CString sJudge = TapNoteScoreToString( (TapNoteScore)i );
+		CString sJudge = TapNoteScoreToString( i );
 		CString sCommand = Capitalize(sJudge)+"Command";
 		m_sScoreCommand[i] = NOTESKIN->GetMetric( sNoteSkin, m_sName, sCommand );
 	}
@@ -42,7 +42,7 @@ void GhostArrow::Init( PlayerNumber pn )
 
 void GhostArrow::Step( TapNoteScore score )
 {
-	for( int i=0; i<NUM_TAP_NOTE_SCORES; i++ )
+	FOREACH_TapNoteScore( i )
 	{
 		// HACK: never hide the mine explosion
 		if( i == TNS_HIT_MINE )
diff --git a/stepmania/src/ReceptorArrow.cpp b/stepmania/src/ReceptorArrow.cpp
index 45361ab304..4a8383fe55 100644
--- a/stepmania/src/ReceptorArrow.cpp
+++ b/stepmania/src/ReceptorArrow.cpp
@@ -20,7 +20,7 @@ bool ReceptorArrow::Load( CString NoteSkin, PlayerNumber pn, int iColNo )
 	m_PlayerNumber = pn;
 	m_iColNo = iColNo;
 
-        NoteFieldMode &mode = g_NoteFieldMode[pn];
+    NoteFieldMode &mode = g_NoteFieldMode[pn];
 	CString sButton = mode.GrayButtonNames[iColNo];
 	if( sButton == "" )
 		sButton = NoteSkinManager::ColToButtonName( iColNo );
@@ -28,9 +28,9 @@ bool ReceptorArrow::Load( CString NoteSkin, PlayerNumber pn, int iColNo )
 	CString sPath;
 	m_pReceptorWaiting.Load( NOTESKIN->GetPathToFromNoteSkinAndButton(NoteSkin,sButton,"receptor waiting") );
 	m_pReceptorGo.Load( NOTESKIN->GetPathToFromNoteSkinAndButton(NoteSkin,sButton,"receptor go") );
-	for( int i=0; i<NUM_TAP_NOTE_SCORES; i++ )
+	FOREACH_TapNoteScore( i )
 	{
-		CString sJudge = TapNoteScoreToString( (TapNoteScore)i );
+		CString sJudge = TapNoteScoreToString( i );
 		CString sCommand = Capitalize(sJudge)+"Command";
 		m_sScoreCommand[i] = NOTESKIN->GetMetric( NoteSkin, m_sName, sCommand );
 	}