diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 8227e75df3..18dde248d7 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -106,7 +106,7 @@ void NoteData::CopyAll( const NoteData& from )
 bool NoteData::IsRowEmpty( int row ) const
 {
 	for( int t=0; t<GetNumTracks(); t++ )
-		if( GetTapNoteX(t, row).type != TapNote::empty )
+		if( GetTapNote(t, row).type != TapNote::empty )
 			return false;
 	return true;
 }
@@ -116,7 +116,7 @@ bool NoteData::IsRangeEmpty( int track, int rowBegin, int rowEnd ) const
 	ASSERT( track < GetNumTracks() );
 
 	FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( *this, track, r, rowBegin, rowEnd )
-		if( GetTapNoteX(track,r).type != TapNote::empty )
+		if( GetTapNote(track,r).type != TapNote::empty )
 			return false;
 	return true;
 }
@@ -141,7 +141,7 @@ bool NoteData::GetTapFirstNonEmptyTrack( int row, int &iNonEmptyTrackOut ) const
 {
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
-		if( GetTapNoteX( t, row ).type != TapNote::empty )
+		if( GetTapNote( t, row ).type != TapNote::empty )
 		{
 			iNonEmptyTrackOut = t;
 			return true;
@@ -154,7 +154,7 @@ bool NoteData::GetTapFirstEmptyTrack( int row, int &iEmptyTrackOut ) const
 {
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
-		if( GetTapNoteX( t, row ).type == TapNote::empty )
+		if( GetTapNote( t, row ).type == TapNote::empty )
 		{
 			iEmptyTrackOut = t;
 			return true;
@@ -167,7 +167,7 @@ bool NoteData::GetTapLastEmptyTrack( int row, int &iEmptyTrackOut ) const
 {
 	for( int t=GetNumTracks()-1; t>=0; t-- )
 	{
-		if( GetTapNoteX( t, row ).type == TapNote::empty )
+		if( GetTapNote( t, row ).type == TapNote::empty )
 		{
 			iEmptyTrackOut = t;
 			return true;
@@ -181,7 +181,7 @@ int NoteData::GetNumTracksWithTap( int row ) const
 	int iNum = 0;
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
-		const TapNote &tn = GetTapNoteX( t, row );
+		const TapNote &tn = GetTapNote( t, row );
 		if( tn.type == TapNote::tap )
 			iNum++;
 	}
@@ -193,7 +193,7 @@ int NoteData::GetNumTracksWithTapOrHoldHead( int row ) const
 	int iNum = 0;
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
-		const TapNote &tn = GetTapNoteX( t, row );
+		const TapNote &tn = GetTapNote( t, row );
 		if( tn.type == TapNote::tap || tn.type == TapNote::hold_head )
 			iNum++;
 	}
@@ -204,7 +204,7 @@ int NoteData::GetFirstTrackWithTap( int row ) const
 {
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
-		const TapNote &tn = GetTapNoteX( t, row );
+		const TapNote &tn = GetTapNote( t, row );
 		if( tn.type == TapNote::tap )
 			return t;
 	}
@@ -215,7 +215,7 @@ int NoteData::GetFirstTrackWithTapOrHoldHead( int row ) const
 {
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
-		const TapNote &tn = GetTapNoteX( t, row );
+		const TapNote &tn = GetTapNote( t, row );
 		if( tn.type == TapNote::tap || tn.type == TapNote::hold_head )
 			return t;
 	}
@@ -366,7 +366,7 @@ int NoteData::GetNumTapNotes( float fStartBeat, float fEndBeat ) const
 	{
 		FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( *this, t, r, iStartIndex, iEndIndex )
 		{
-			const TapNote &tn = GetTapNoteX(t, r);
+			const TapNote &tn = GetTapNote(t, r);
 			if( tn.type != TapNote::empty  &&  tn.type != TapNote::mine )
 				iNumNotes++;
 		}
@@ -409,7 +409,7 @@ int NoteData::GetNumMines( float fStartBeat, float fEndBeat ) const
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
 		FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( *this, t, r, iStartIndex, iEndIndex )
-			if( GetTapNoteX(t, r).type == TapNote::mine )
+			if( GetTapNote(t, r).type == TapNote::mine )
 				iNumMines++;
 	}
 	
@@ -438,7 +438,7 @@ int NoteData::RowNeedsHands( const int row ) const
 	int iNumNotesThisIndex = 0;
 	for( int t=0; t<GetNumTracks(); t++ )
 	{
-		const TapNote &tn = GetTapNoteX(t, row);
+		const TapNote &tn = GetTapNote(t, row);
 		switch( tn.type )
 		{
 		case TapNote::mine:
@@ -514,7 +514,7 @@ int NoteData::GetNumN( int iMinTaps, float fStartBeat, float fEndBeat ) const
 		int iNumNotesThisIndex = 0;
 		for( int t=0; t<GetNumTracks(); t++ )
 		{
-			const TapNote &tn = GetTapNoteX(t, r);
+			const TapNote &tn = GetTapNote(t, r);
 			if( tn.type != TapNote::mine  &&  tn.type != TapNote::empty )	// mines don't count
 				iNumNotesThisIndex++;
 		}
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index ecd7b3a993..97826c98c0 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -41,15 +41,9 @@ public:
 
 	/* Return the note at the given track and row.  Row may be out of
 	 * range; pretend the song goes on with TAP_EMPTYs indefinitely. */
-	inline const TapNote &GetTapNote(unsigned track, int row) const
-	{
-		return GetTapNoteX( track, row );
-	}
 	void ReserveRows( int row );
 
-	/* GetTapNote is called a lot.  This one doesn't do any bounds checking,
-	 * which is much faster.  Be sure that 0 <= row < GetNumRows(). */
-	inline const TapNote &GetTapNoteX(unsigned track, int row) const
+	inline const TapNote &GetTapNote(unsigned track, int row) const
 	{
 		const TrackMap &mapTrack = m_TapNotes[track];
 		TrackMap::const_iterator iter = mapTrack.find( row );
diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index a2eb9fc79c..f50c27129f 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -142,7 +142,7 @@ int NoteDataWithScoring::GetSuccessfulHands( float fStartBeat, float fEndBeat )
 		bool Missed = false;
 		for( int t=0; t<GetNumTracks(); t++ )
 		{
-			TapNote tn = GetTapNoteX(t, i);
+			TapNote tn = GetTapNote(t, i);
 			if( tn.type == TapNote::empty )
 				continue;
 			if( tn.type == TapNote::mine ) // mines don't count
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 62bc9974fd..eda1f5aa0a 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -130,7 +130,7 @@ static StepsType DetermineStepsType( int iPlayer, const NoteData &nd )
 	{
 		for( int r=0; r<=iLastRow; r++ )
 		{
-			if( nd.GetTapNoteX(t, r).type != TapNote::empty )
+			if( nd.GetTapNote(t, r).type != TapNote::empty )
 			{
 				bTrackHasNote[t] = true;
 				break;