diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 50adbdb3fa..17280607af 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -41,8 +41,7 @@ int CompareBGSegments(const BGSegment &seg1, const BGSegment &seg2)
 
 void SortBGSegmentArray( CArray<BGSegment,BGSegment&> &arrayBGSegments )
 {
-	sort( arrayBGSegments.GetData(), arrayBGSegments.GetData()+arrayBGSegments.GetSize(),
-		CompareBGSegments );
+	sort( arrayBGSegments.begin(), arrayBGSegments.end(), CompareBGSegments );
 }
 
 
diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 68d5be1582..0361c10d91 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -267,6 +267,5 @@ static int CompareCoursePointersByDifficulty(const Course* pCourse1, const Cours
 
 void SortCoursePointerArrayByDifficulty( CArray<Course*,Course*> &apCourses )
 {
-	sort( apCourses.GetData(), apCourses.GetData()+apCourses.GetSize(), 
-		CompareCoursePointersByDifficulty );
+	sort( apCourses.begin(), apCourses.end(), CompareCoursePointersByDifficulty );
 }
diff --git a/stepmania/src/Notes.cpp b/stepmania/src/Notes.cpp
index 2eeec1903a..19ddb22c1f 100644
--- a/stepmania/src/Notes.cpp
+++ b/stepmania/src/Notes.cpp
@@ -211,7 +211,6 @@ bool CompareNotesPointersByDifficulty(const Notes *pNotes1, const Notes *pNotes2
 
 void SortNotesArrayByDifficulty( CArray<Notes*,Notes*> &arraySteps )
 {
-	sort( arraySteps.GetData(), arraySteps.GetData()+arraySteps.GetSize(),
-		CompareNotesPointersByDifficulty );
+	sort( arraySteps.begin(), arraySteps.end(), CompareNotesPointersByDifficulty );
 }
 
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index fdc2f4604e..8154996f40 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -685,8 +685,7 @@ bool CompareCStringsDesc(const CString &str1, const CString &str2)
 
 void SortCStringArray( CStringArray &arrayCStrings, const bool bSortAscending )
 {
-	sort( arrayCStrings.GetData(),
-			arrayCStrings.GetData()+arrayCStrings.GetSize(),
+	sort( arrayCStrings.begin(), arrayCStrings.end(),
 			bSortAscending?CompareCStringsAsc:CompareCStringsDesc);
 }
 
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 41cac03452..e405b9b82e 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -43,8 +43,7 @@ static int CompareBPMSegments(const BPMSegment &seg1, const BPMSegment &seg2)
 
 void SortBPMSegmentsArray( CArray<BPMSegment,BPMSegment&> &arrayBPMSegments )
 {
-	sort( arrayBPMSegments.GetData(),
-		arrayBPMSegments.GetData()+arrayBPMSegments.GetSize(), CompareBPMSegments );
+	sort( arrayBPMSegments.begin(), arrayBPMSegments.end(), CompareBPMSegments );
 }
 
 static int CompareStopSegments(const StopSegment &seg1, const StopSegment &seg2)
@@ -54,8 +53,7 @@ static int CompareStopSegments(const StopSegment &seg1, const StopSegment &seg2)
 
 void SortStopSegmentsArray( CArray<StopSegment,StopSegment&> &arrayStopSegments )
 {
-	sort( arrayStopSegments.GetData(),
-		arrayStopSegments.GetData()+arrayStopSegments.GetSize(), CompareStopSegments );
+	sort( arrayStopSegments.begin(), arrayStopSegments.end(), CompareStopSegments );
 }
 
 int CompareBackgroundChanges(const BackgroundChange &seg1, const BackgroundChange &seg2)
@@ -65,8 +63,7 @@ int CompareBackgroundChanges(const BackgroundChange &seg1, const BackgroundChang
 
 void SortBackgroundChangesArray( CArray<BackgroundChange,BackgroundChange&> &arrayBackgroundChanges )
 {
-	sort( arrayBackgroundChanges.GetData(), 
-		arrayBackgroundChanges.GetData()+arrayBackgroundChanges.GetSize(), CompareBackgroundChanges );
+	sort( arrayBackgroundChanges.begin(), arrayBackgroundChanges.end(), CompareBackgroundChanges );
 }
 
 
@@ -891,9 +888,7 @@ int CompareSongPointersByTitle(const Song *pSong1, const Song *pSong2)
 
 void SortSongPointerArrayByTitle( CArray<Song*, Song*> &arraySongPointers )
 {
-	sort( arraySongPointers.GetData(), 
-		arraySongPointers.GetData()+arraySongPointers.GetSize(),
-		   CompareSongPointersByTitle );
+	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByTitle );
 }
 
 int CompareSongPointersByDifficulty(const Song *pSong1, const Song *pSong2)
@@ -922,9 +917,7 @@ int CompareSongPointersByDifficulty(const Song *pSong1, const Song *pSong2)
 
 void SortSongPointerArrayByDifficulty( CArray<Song*, Song*> &arraySongPointers )
 {
-	sort( arraySongPointers.GetData(), 
-		arraySongPointers.GetData()+arraySongPointers.GetSize(),
-		   CompareSongPointersByDifficulty );
+	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByDifficulty );
 }
 
 bool CompareSongPointersByBPM(const Song *pSong1, const Song *pSong2)
@@ -943,9 +936,7 @@ bool CompareSongPointersByBPM(const Song *pSong1, const Song *pSong2)
 
 void SortSongPointerArrayByBPM( CArray<Song*, Song*> &arraySongPointers )
 {
-	sort( arraySongPointers.GetData(), 
-		arraySongPointers.GetData()+arraySongPointers.GetSize(),
-		   CompareSongPointersByBPM );
+	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByBPM );
 }
 
 
@@ -963,9 +954,7 @@ int CompareSongPointersByArtist(const Song *pSong1, const Song *pSong2)
 
 void SortSongPointerArrayByArtist( CArray<Song*, Song*> &arraySongPointers )
 {
-	sort( arraySongPointers.GetData(), 
-		arraySongPointers.GetData()+arraySongPointers.GetSize(),
-		   CompareSongPointersByArtist );
+	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByArtist );
 }
 
 int CompareSongPointersByGroup(const Song *pSong1, const Song *pSong2)
@@ -984,9 +973,7 @@ int CompareSongPointersByGroup(const Song *pSong1, const Song *pSong2)
 
 void SortSongPointerArrayByGroup( CArray<Song*, Song*> &arraySongPointers )
 {
-	sort( arraySongPointers.GetData(), 
-		arraySongPointers.GetData()+arraySongPointers.GetSize(),
-		   CompareSongPointersByGroup );
+	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByGroup );
 }
 
 int CompareSongPointersByMostPlayed(const Song *pSong1, const Song *pSong2)
@@ -1003,9 +990,7 @@ int CompareSongPointersByMostPlayed(const Song *pSong1, const Song *pSong2)
 
 void SortSongPointerArrayByMostPlayed( CArray<Song*, Song*> &arraySongPointers )
 {
-	sort( arraySongPointers.GetData(), 
-		arraySongPointers.GetData()+arraySongPointers.GetSize(),
-		   CompareSongPointersByMostPlayed );
+	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByMostPlayed );
 }
 
 bool Song::NormallyDisplayed() const