diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index 4c5bc25e2b..fcca3dcc59 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -14,7 +14,7 @@
 
 #include "InputHandler/Selector_InputHandler.h"
 static LocalizedString INPUT_HANDLERS_EMPTY( "Arch", "Input Handlers cannot be empty." );
-void MakeInputHandlers( CString drivers, vector<InputHandler *> &Add )
+void MakeInputHandlers( const CString &drivers, vector<InputHandler *> &Add )
 {
 	vector<CString> DriversToTry;
 	split( drivers, ",", DriversToTry, true );
@@ -71,7 +71,7 @@ void MakeInputHandlers( CString drivers, vector<InputHandler *> &Add )
 }
 
 #include "Lights/Selector_LightsDriver.h"
-void MakeLightsDrivers( CString driver, vector<LightsDriver *> &Add )
+void MakeLightsDrivers( const CString &driver, vector<LightsDriver *> &Add )
 {
 	LOG->Trace( "Initializing lights driver: %s", driver.c_str() );
 
@@ -228,7 +228,7 @@ RageMovieTexture *MakeRageMovieTexture( RageTextureID ID )
 			SAFE_DELETE( ret );
 		}
 	}
-	if (!ret)
+	if ( !ret )
 		RageException::Throw( COULDNT_CREATE_MOVIE_DRIVER.GetValue() );
 
 	LOG->Trace( "Created movie texture \"%s\" with driver \"%s\"",
@@ -238,7 +238,7 @@ RageMovieTexture *MakeRageMovieTexture( RageTextureID ID )
 
 #include "Sound/Selector_RageSoundDriver.h"
 static LocalizedString SOUND_DRIVERS_CANNOT_EMPTY( "Arch", "Sound Drivers cannot be empty." );
-RageSoundDriver *MakeRageSoundDriver( CString drivers )
+RageSoundDriver *MakeRageSoundDriver( const CString &drivers )
 {
 	vector<CString> DriversToTry;
 	split( drivers, ",", DriversToTry, true );
@@ -293,7 +293,7 @@ RageSoundDriver *MakeRageSoundDriver( CString drivers )
 		}
 	}
 	
-	if(ret)
+	if( ret )
 		LOG->Info( "Sound driver: %s", Driver.c_str() );
 	
 	return ret;
diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h
index ea783b2317..35dc7a4fb5 100644
--- a/stepmania/src/arch/arch.h
+++ b/stepmania/src/arch/arch.h
@@ -21,10 +21,10 @@ class DialogDriver;
 DialogDriver *MakeDialogDriver();
 
 class InputHandler;
-void MakeInputHandlers( CString drivers, vector<InputHandler *> &Add );
+void MakeInputHandlers( const CString &drivers, vector<InputHandler *> &Add );
 
 class LightsDriver;
-void MakeLightsDrivers( CString drivers, vector<LightsDriver *> &Add );
+void MakeLightsDrivers( const CString &drivers, vector<LightsDriver *> &Add );
 
 class LoadingWindow;
 LoadingWindow *MakeLoadingWindow();
@@ -41,7 +41,7 @@ class RageMovieTexture;
 RageMovieTexture *MakeRageMovieTexture( RageTextureID ID );
 
 class RageSoundDriver;
-RageSoundDriver *MakeRageSoundDriver( CString drivers );
+RageSoundDriver *MakeRageSoundDriver( const CString &drivers );
 
 #endif