diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 8664ac48a5..9ef158dfca 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -181,7 +181,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR CmdLine, int nCmdShow
 
 	CStringArray Cmds;
 	SplitCommandLine(CmdLine, Cmds);
-	for(int i = 0; i < Cmds.GetSize(); ++i)
+	for(unsigned i = 0; i < Cmds.size(); ++i)
 	{
 		if(Cmds[i] == "--fsck") { crash(); exit( 0 ); }
 	}
@@ -228,7 +228,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR CmdLine, int nCmdShow
 		//
 		CStringArray asPackagePaths;
 		GetDirListing( "AutoInstall\\*.smzip", asPackagePaths, false, true );
-		for( i=0; i<asPackagePaths.GetSize(); i++ )
+		for( i=0; i<asPackagePaths.size(); i++ )
 		{
 			CString sCommandLine = ssprintf( "smpackage.exe %s", asPackagePaths[i].GetString() );
 
@@ -446,14 +446,14 @@ BOOL CALLBACK LoadingWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
 				IDC_STATIC_MESSAGE2, 
 				WM_SETTEXT, 
 				0, 
-				(LPARAM)(LPCTSTR)(asMessageLines.GetSize()>=2 ? asMessageLines[1] : "")
+				(LPARAM)(LPCTSTR)(asMessageLines.size()>=2 ? asMessageLines[1] : "")
 			);
 			SendDlgItemMessage( 
 				hWnd, 
 				IDC_STATIC_MESSAGE3, 
 				WM_SETTEXT, 
 				0, 
-				(LPARAM)(LPCTSTR)(asMessageLines.GetSize()>=3 ? asMessageLines[2] : "")
+				(LPARAM)(LPCTSTR)(asMessageLines.size()>=3 ? asMessageLines[2] : "")
 			);
 		}
 		break;
@@ -916,7 +916,7 @@ void Update()
 	ieArray.clear();	// empty the array
 	INPUTFILTER->GetInputEvents( ieArray, fDeltaTime );
 
-	for( int i=0; i<ieArray.GetSize(); i++ )
+	for( unsigned i=0; i<ieArray.size(); i++ )
 	{
 		DeviceInput DeviceI = (DeviceInput)ieArray[i];
 		InputEventType type = ieArray[i].type;
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 44d3eda468..9e463083b2 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -50,7 +50,7 @@ void ThemeManager::GetAllThemeNames( CStringArray& AddTo )
 	GetDirListing( THEMES_DIR+"\\*", AddTo, true );
 	
 	// strip out the folder called "CVS"
-	for( int i=AddTo.GetSize()-1; i>=0; i-- )
+	for( int i=AddTo.size()-1; i >= 0; i-- )
 		if( 0 == stricmp(AddTo[i],"cvs") )
 			AddTo.RemoveAt(i);
 }
@@ -63,7 +63,7 @@ void ThemeManager::GetThemeNamesForCurGame( CStringArray& AddTo )
 	// strip out announcers that don't have the current game name in them
 	CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
 	sGameName.MakeLower();
-	for( int i=AddTo.GetSize()-1; i>=0; i-- )
+	for( unsigned i=AddTo.size()-1; i>=0; i-- )
 	{
 		CString sLowercaseVer = AddTo[i];
 		sLowercaseVer.MakeLower();
@@ -77,7 +77,7 @@ bool ThemeManager::DoesThemeExist( CString sThemeName )
 {
 	CStringArray asThemeNames;	
 	GetAllThemeNames( asThemeNames );
-	for( int i=0; i<asThemeNames.GetSize(); i++ )
+	for( unsigned i=0; i<asThemeNames.size(); i++ )
 	{
 		if( 0==stricmp(sThemeName, asThemeNames[i]) )
 			return true;
@@ -125,7 +125,7 @@ try_element_again:
 
 	// look for a redirect
 	GetDirListing( sCurrentThemeDir + sAssetCategory+"\\"+sFileName + "*.redir", asPossibleElementFilePaths, false, true );
-	if( asPossibleElementFilePaths.GetSize() > 0 )
+	if( !asPossibleElementFilePaths.empty() )
 	{
 		CStdioFile file;
 		file.Open( asPossibleElementFilePaths[0], CFile::modeRead );
@@ -160,7 +160,7 @@ try_element_again:
 		GetDirListing( sDefaultThemeDir + sAssetCategory+"\\"+sFileName + asset_masks[i],
 						asPossibleElementFilePaths, false, true );
 
-	if( asPossibleElementFilePaths.GetSize() == 0 )
+	if( asPossibleElementFilePaths.empty() )
 	{
 #ifdef _DEBUG
 		switch( AfxMessageBox( ssprintf("The theme element %s/%s is missing.",sAssetCategory.GetString(),sFileName.GetString()), MB_ABORTRETRYIGNORE ) )