diff --git a/stepmania/src/NoteDataUtil.h b/stepmania/src/NoteDataUtil.h
index b980bce1ae..28aa35713e 100644
--- a/stepmania/src/NoteDataUtil.h
+++ b/stepmania/src/NoteDataUtil.h
@@ -32,21 +32,21 @@ namespace NoteDataUtil
 
 	void GetRadarValues( const NoteData &in, float fSongSeconds, RadarValues& out );
 
-	void RemoveHoldNotes( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void RemoveSimultaneousNotes( NoteData &inout, int iMaxSimultaneous, int iStartIndex = 0, int iEndIndex = 999999 );
-	void RemoveJumps( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void RemoveHands( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void RemoveQuads( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void RemoveMines( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
+	void RemoveHoldNotes( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void RemoveSimultaneousNotes( NoteData &inout, int iMaxSimultaneous, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void RemoveJumps( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void RemoveHands( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void RemoveQuads( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void RemoveMines( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
 	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, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Little( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Wide( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Big( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Quick( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void BMRize( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Skippy( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
+	void Turn( NoteData &inout, StepsType st, TrackMapping tt, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Little( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Wide( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Big( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Quick( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void BMRize( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Skippy( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
 	void InsertIntelligentTaps( 
 		NoteData &in, 
 		int iWindowSizeRows,
@@ -54,14 +54,14 @@ namespace NoteDataUtil
 		int iWindowStrideRows,
 		bool bSkippy, 
 		int iStartIndex = 0,
-		int iEndIndex = 999999 );
-	void AddMines( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Echo( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Stomp( NoteData &inout, StepsType st, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Planted( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Floored( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void Twister( NoteData &inout, int iStartIndex = 0, int iEndIndex = 999999 );
-	void ConvertTapsToHolds( NoteData &inout, int iSimultaneousHolds, int iStartIndex = 0, int iEndIndex = 999999 );
+		int iEndIndex = MAX_NOTE_ROW );
+	void AddMines( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Echo( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Stomp( NoteData &inout, StepsType st, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Planted( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Floored( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void Twister( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
+	void ConvertTapsToHolds( NoteData &inout, int iSimultaneousHolds, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
 
 	// change all TAP_ADDITIONs to TAP_TAPs
 	void ConvertAdditionsToRegular( NoteData &inout );
@@ -90,11 +90,11 @@ namespace NoteDataUtil
 	bool RowPassesValidMask( NoteData &inout, int row, const bool bValidMask[] );
 
 	void TransformNoteData( NoteData &nd, const AttackArray &aa, StepsType st, Song* pSong );
-	void TransformNoteData( NoteData &nd, const PlayerOptions &po, StepsType st, int iStartIndex = 0, int iEndIndex = 999999 );
+	void TransformNoteData( NoteData &nd, const PlayerOptions &po, StepsType st, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
 	void AddTapAttacks( NoteData &nd, Song* pSong );
 
 	// void Scale( NoteData &nd, float fScale );
-	void ScaleRegion( NoteData &nd, float fScale, int iStartIndex = 0, int iEndIndex = 999999 );
+	void ScaleRegion( NoteData &nd, float fScale, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
 	inline void Scale( NoteData &nd, float fScale ) { NoteDataUtil::ScaleRegion(nd, fScale); }
 
 	// If iRowsToShift > 0, add blank rows.  If iRowsToShift < 0, delete rows
diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index a742650732..86abb5daef 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -6,7 +6,7 @@
 namespace
 {
 
-int GetNumTapNotesWithScore( const NoteData &in, TapNoteScore tns, int iStartIndex = 0, int iEndIndex = 999999 )
+int GetNumTapNotesWithScore( const NoteData &in, TapNoteScore tns, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW )
 { 
 	int iNumSuccessfulTapNotes = 0;
 	for( int t=0; t<in.GetNumTracks(); t++ )
@@ -22,7 +22,7 @@ int GetNumTapNotesWithScore( const NoteData &in, TapNoteScore tns, int iStartInd
 	return iNumSuccessfulTapNotes;
 }
 
-int GetNumNWithScore( const NoteData &in, TapNoteScore tns, int MinTaps, int iStartIndex = 0, int iEndIndex = 999999 )
+int GetNumNWithScore( const NoteData &in, TapNoteScore tns, int MinTaps, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW )
 {
 	int iNumSuccessfulDoubles = 0;
 	FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( in, i, iStartIndex, iEndIndex )
@@ -47,7 +47,7 @@ int GetNumNWithScore( const NoteData &in, TapNoteScore tns, int MinTaps, int iSt
 	return iNumSuccessfulDoubles;
 }
 
-int GetNumHoldNotesWithScore( const NoteData &in, HoldNoteScore hns, int iStartIndex = 0, int iEndIndex = 999999 )
+int GetNumHoldNotesWithScore( const NoteData &in, HoldNoteScore hns, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW )
 {
 	int iNumSuccessfulHolds = 0;
 	for( int i=0; i<in.GetNumHoldNotes(); i++ )
@@ -61,7 +61,7 @@ int GetNumHoldNotesWithScore( const NoteData &in, HoldNoteScore hns, int iStartI
 	return iNumSuccessfulHolds;
 }
 
-int GetSuccessfulMines( const NoteData &in, int iStartIndex = 0, int iEndIndex = 999999 )
+int GetSuccessfulMines( const NoteData &in, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW )
 {
 	int iNumSuccessfulMinesNotes = 0;
 	FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( in, i, iStartIndex, iEndIndex )
@@ -78,7 +78,7 @@ int GetSuccessfulMines( const NoteData &in, int iStartIndex = 0, int iEndIndex =
 }
 
 /* See NoteData::GetNumHands(). */
-int GetSuccessfulHands( const NoteData &in, int iStartIndex = 0, int iEndIndex = 999999 )
+int GetSuccessfulHands( const NoteData &in, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW )
 {
 	int iNum = 0;
 	FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( in, i, iStartIndex, iEndIndex )
diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h
index ec053fd6db..0300192289 100644
--- a/stepmania/src/NoteTypes.h
+++ b/stepmania/src/NoteTypes.h
@@ -136,6 +136,7 @@ const int MAX_NOTE_TRACKS = 16;
 const int BEATS_PER_MEASURE = 4;
 const int ROWS_PER_BEAT	= 48;	// It is important that this number is evenly divisible by 2, 3, and 4.
 const int ROWS_PER_MEASURE = ROWS_PER_BEAT * BEATS_PER_MEASURE;
+const int MAX_NOTE_ROW = ( (1<<30) / ROWS_PER_BEAT );
 
 enum NoteType 
 {