diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index f3fb4c8ac6..422ffc0067 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -303,14 +303,14 @@ int NoteData::GetFirstRow() const
 	
 	for( int t=0; t < GetNumTracks(); t++ )
 	{
-		const TrackMap &trackMap = m_TapNotes[t];
-		TrackMap::const_iterator iter = trackMap.begin();
-		if( iter == trackMap.end() )	// trackMap is empty
+		int iRow = -1;
+		if( !GetNextTapNoteRowForTrack( t, iRow ) )
 			continue;
+
 		if( iEarliestRowFoundSoFar == -1 )
-			iEarliestRowFoundSoFar = iter->first;
+			iEarliestRowFoundSoFar = iRow;
 		else
-			iEarliestRowFoundSoFar = min( iEarliestRowFoundSoFar, iter->first );
+			iEarliestRowFoundSoFar = min( iEarliestRowFoundSoFar, iRow );
 	}
 
 	for( int i=0; i<GetNumHoldNotes(); i++ )
@@ -332,11 +332,10 @@ int NoteData::GetLastRow() const
 	
 	for( int t=0; t < GetNumTracks(); t++ )
 	{
-		const TrackMap &trackMap = m_TapNotes[t];
-		const TrackMap::const_reverse_iterator  iter = trackMap.rbegin();
-		if( iter == trackMap.rend() )	// trackMap is empty
+		int iRow = 999999999;
+		if( !GetPrevTapNoteRowForTrack( t, iRow ) )
 			continue;
-		iOldestRowFoundSoFar = max( iOldestRowFoundSoFar, iter->first );
+		iOldestRowFoundSoFar = max( iOldestRowFoundSoFar, iRow );
 	}
 
 	for( int i=0; i<GetNumHoldNotes(); i++ )
@@ -718,26 +717,6 @@ void NoteData::SetTapNote( int track, int row, const TapNote& t )
 	}
 }
 
-void NoteData::EliminateAllButOneTap( int row )
-{
-	if(row < 0) return;
-
-	int track;
-	for(track = 0; track < GetNumTracks(); ++track)
-	{
-		if( m_TapNotes[track][row].type == TapNote::tap )
-			break;
-	}
-
-	track++;
-
-	for( ; track < GetNumTracks(); ++track)
-	{
-		if( m_TapNotes[track][row].type == TapNote::tap )
-			m_TapNotes[track][row] = TAP_EMPTY;
-	}
-}
-
 void NoteData::GetTracksHeldAtRow( int row, set<int>& addTo )
 {
 	for( unsigned i=0; i<m_HoldNotes.size(); i++ )
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 386241b92b..e2448b14b7 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -134,8 +134,6 @@ public:
 	void ConvertHoldNotesTo4s();
 	void To4s( const NoteData& from );
 	void From4s( const NoteData& from );
-
-	void EliminateAllButOneTap( int row ); 
 };
 
 
diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index ec52e0b7e4..bf4183f834 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -585,6 +585,25 @@ void NoteDataUtil::RemoveMines(NoteData &inout, float fStartBeat, float fEndBeat
 				inout.SetTapNote( t, r, TAP_EMPTY );
 }
 
+void NoteDataUtil::RemoveAllButOneTap( NoteData &inout, int row )
+{
+	if(row < 0) return;
+
+	int track;
+	for( track = 0; track < inout.GetNumTracks(); ++track )
+	{
+		if( inout.GetTapNote(track, row).type == TapNote::tap )
+			break;
+	}
+
+	track++;
+
+	for( ; track < inout.GetNumTracks(); ++track )
+	{
+		if( inout.GetTapNote(track, row).type == TapNote::tap )
+			inout.SetTapNote(track, row, TAP_EMPTY );
+	}
+}
 
 static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int NumTracks, int *iTakeFromTrack )
 {
@@ -1526,7 +1545,7 @@ void NoteDataUtil::FixImpossibleRows( NoteData &inout, StepsType st )
 		}
 
 		if( !bPassedOneMask )
-			inout.EliminateAllButOneTap(r);
+			RemoveAllButOneTap( inout, r );
 	}
 }
 
diff --git a/stepmania/src/NoteDataUtil.h b/stepmania/src/NoteDataUtil.h
index 1cfcd1711c..794c0064ae 100644
--- a/stepmania/src/NoteDataUtil.h
+++ b/stepmania/src/NoteDataUtil.h
@@ -38,6 +38,7 @@ namespace NoteDataUtil
 	void RemoveHands( NoteData &inout, float fStartBeat = 0, float fEndBeat = 99999 );
 	void RemoveQuads( NoteData &inout, float fStartBeat = 0, float fEndBeat = 99999 );
 	void RemoveMines( NoteData &inout, float fStartBeat = 0, float fEndBeat = 99999 );
+	void RemoveAllButOneTap( NoteData &inout, int row );
 	enum TrackMapping { left, right, mirror, shuffle, super_shuffle, stomp, NUM_TRACK_MAPPINGS };
 	void Turn( NoteData &inout, StepsType st, TrackMapping tt, float fStartBeat = 0, float fEndBeat = -1 );
 	void Little( NoteData &inout, float fStartBeat = 0, float fEndBeat = 99999 );