diff --git a/stepmania/src/Command.cpp b/stepmania/src/Command.cpp
index 63cfd41ea4..60b3ee66ef 100644
--- a/stepmania/src/Command.cpp
+++ b/stepmania/src/Command.cpp
@@ -11,8 +11,7 @@ RString Command::GetName() const
 	if( m_vsArgs.empty() )
 		return RString();
 	RString s = m_vsArgs[0];
-	TrimLeft( s );
-	TrimRight( s );
+	Trim( s );
 
 	/* Transition hack: if a command begins with !, don't force it to lowercase. */
 	if( s.Left(1) == "!" )
diff --git a/stepmania/src/CourseLoaderCRS.cpp b/stepmania/src/CourseLoaderCRS.cpp
index ac62ea2242..1f4907f548 100644
--- a/stepmania/src/CourseLoaderCRS.cpp
+++ b/stepmania/src/CourseLoaderCRS.cpp
@@ -107,8 +107,7 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou
 				if( sBits.size() < 2 )
 					continue;
 
-				TrimLeft( sBits[0] );
-				TrimRight( sBits[0] );
+				Trim( sBits[0] );
 				if( !sBits[0].CompareNoCase("TIME") )
 					attack.fStartSecond = max( StringToFloat(sBits[1]), 0.0f );
 				else if( !sBits[0].CompareNoCase("LEN") )
diff --git a/stepmania/src/IniFile.cpp b/stepmania/src/IniFile.cpp
index 50a6592b3e..651b6d6150 100644
--- a/stepmania/src/IniFile.cpp
+++ b/stepmania/src/IniFile.cpp
@@ -62,8 +62,8 @@ bool IniFile::ReadFile( RageFileBasic &f )
 			{
 				RString valuename = line.Left( (int) iEqualIndex );
 				RString value = line.Right( line.size()-valuename.size()-1 );
-				TrimLeft( valuename );		TrimRight( valuename );
-				TrimLeft( value );		TrimRight( value );
+				Trim( valuename );
+				Trim( value );
 				if( keyname.size() && valuename.size() )
 					SetValue( keyname, valuename, value );
 			}
diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index 95f20329a6..e70d0044c6 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -25,10 +25,10 @@ static void LoadFromSMTokens(
 {
 	out.SetSavedToDisk( true );	// we're loading from disk, so this is by definintion already saved
 
-	TrimLeft( sStepsType ); 	TrimRight( sStepsType ); 
-	TrimLeft( sDescription );	TrimRight( sDescription ); 
-	TrimLeft( sDifficulty ); 	TrimRight( sDifficulty ); 
-	TrimLeft( sNoteData );		TrimRight( sNoteData ); 
+	Trim( sStepsType );
+	Trim( sDescription );
+	Trim( sDifficulty );
+	Trim( sNoteData );
 
 //	LOG->Trace( "Steps::LoadFromSMTokens()" );
 
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index a59b478c24..8b24f5d802 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -248,8 +248,7 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
 
 	RString sBit = sOneMod;
 	sBit.MakeLower();
-	TrimLeft(sBit);
-	TrimRight(sBit);
+	Trim( sBit );
 
 	/* "drunk"
 	 * "no drunk"
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index a7493ec4d6..884e6288c3 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -101,8 +101,7 @@ RageLog::~RageLog()
 	split( AdditionalLog, "\n", AdditionalLogLines );
 	for( unsigned i = 0; i < AdditionalLogLines.size(); ++i )
 	{
-		TrimLeft( AdditionalLogLines[i] );
-		TrimRight( AdditionalLogLines[i] );
+		Trim( AdditionalLogLines[i] );
 		this->Info( "%s", AdditionalLogLines[i].c_str() );
 	}
 
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 01f228f346..3f8292f886 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -396,8 +396,7 @@ void ScreenNameEntry::MenuStart( const InputEventPlus &input )
 	Profile* pProfile = PROFILEMAN->GetProfile(pn);
 	pProfile->m_sLastUsedHighScoreName = m_sSelectedName[pn];
 
-	TrimRight( m_sSelectedName[pn], " " );
-	TrimLeft( m_sSelectedName[pn], " " );
+	Trim( m_sSelectedName[pn], " " );
 
 	GAMESTATE->StoreRankingName( pn, m_sSelectedName[pn] );
 
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 24b6cc1db9..f5619c8280 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -166,8 +166,7 @@ bool ScreenNameEntryTraditional::Finish( PlayerNumber pn )
 	Profile* pProfile = PROFILEMAN->GetProfile(pn);
 	pProfile->m_sLastUsedHighScoreName = sSelection;
 
-	TrimRight( sSelection, " " );
-	TrimLeft( sSelection, " " );
+	Trim( sSelection, " " );
 
 	GAMESTATE->StoreRankingName( pn, sSelection );
 
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 2be35ec3cf..d013ed0491 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -358,8 +358,7 @@ void FixupPath( RString &path, const RString &sSongPath )
 	/* Many imported files contain erroneous whitespace before or after
 	 * filenames.  Paths usually don't actually start or end with spaces,
 	 * so let's just remove it. */
-	TrimLeft( path );
-	TrimRight( path );
+	Trim( path );
 }
 
 /* Songs in BlacklistImages will never be autodetected as song images. */
@@ -444,12 +443,9 @@ void Song::TidyUpData()
 	 * their source's values. */
 	ReCalculateRadarValuesAndLastBeat();
 
-	TrimLeft( m_sMainTitle );
-	TrimRight( m_sMainTitle );
-	TrimLeft( m_sSubTitle );
-	TrimRight( m_sSubTitle );
-	TrimLeft( m_sArtist );
-	TrimRight( m_sArtist );
+	Trim( m_sMainTitle );
+	Trim( m_sSubTitle );
+	Trim( m_sArtist );
 
 	/* Fall back on the song directory name. */
 	if( m_sMainTitle == "" )
diff --git a/stepmania/src/SongOptions.cpp b/stepmania/src/SongOptions.cpp
index 98e80fbbe8..87a746c0ef 100644
--- a/stepmania/src/SongOptions.cpp
+++ b/stepmania/src/SongOptions.cpp
@@ -148,8 +148,7 @@ bool SongOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut )
 {
 	RString sBit = sOneMod;
 	sBit.MakeLower();
-	TrimLeft(sBit);
-	TrimRight(sBit);
+	Trim( sBit );
 	
 	Regex mult("^([0-9]+(\\.[0-9]+)?)xmusic$");
 	vector<RString> matches;
diff --git a/stepmania/src/archutils/Unix/BacktraceNames.cpp b/stepmania/src/archutils/Unix/BacktraceNames.cpp
index 5ce8c43bbe..016ab7a79f 100644
--- a/stepmania/src/archutils/Unix/BacktraceNames.cpp
+++ b/stepmania/src/archutils/Unix/BacktraceNames.cpp
@@ -311,8 +311,7 @@ void BacktraceNames::FromString( RString s )
     unsigned pos = 0;
     while( pos < s.size() && s[pos] != '(' && s[pos] != '[' )
         File += s[pos++];
-    TrimRight( File );
-    TrimLeft( File );
+    Trim( File );
 
     if( pos < s.size() && s[pos] == '(' )
     {