diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 6e033a71cb..85ca34a922 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -30,14 +30,26 @@ CString DifficultyToString( Difficulty dc )
 	}
 }
 
+/* We prefer the above names; recognize a number of others, too.  (They'l
+ * get normalized when written to SMs, etc.) */
 Difficulty StringToDifficulty( CString sDC )
 {
-	for( int i=0; i<NUM_DIFFICULTIES; i++ )
-	{
-		Difficulty dc = (Difficulty)i;
-		if( sDC == DifficultyToString(dc) )
-			return dc;
-	}
+	sDC.MakeLower();
+	if( sDC == "beginner" )			return DIFFICULTY_BEGINNER;
+	else if( sDC == "easy" )		return DIFFICULTY_EASY;
+	else if( sDC == "basic" )		return DIFFICULTY_EASY;
+	else if( sDC == "light" )		return DIFFICULTY_EASY;
+	else if( sDC == "medium" )		return DIFFICULTY_MEDIUM;
+	else if( sDC == "another" )		return DIFFICULTY_MEDIUM;
+	else if( sDC == "trick" )		return DIFFICULTY_MEDIUM;
+	else if( sDC == "standard" )	return DIFFICULTY_MEDIUM;
+	else if( sDC == "hard" )		return DIFFICULTY_HARD;
+	else if( sDC == "ssr" )			return DIFFICULTY_HARD;
+	else if( sDC == "maniac" )		return DIFFICULTY_HARD;
+	else if( sDC == "heavy" )		return DIFFICULTY_HARD;
+	else if( sDC == "smaniac" )		return DIFFICULTY_CHALLENGE;
+	else if( sDC == "challenge" )	return DIFFICULTY_CHALLENGE;
+
 	return DIFFICULTY_INVALID;
 }
 
diff --git a/stepmania/src/Notes.cpp b/stepmania/src/Notes.cpp
index 889edcc785..856e00429a 100644
--- a/stepmania/src/Notes.cpp
+++ b/stepmania/src/Notes.cpp
@@ -122,24 +122,7 @@ RageColor Notes::GetColor() const
 void Notes::TidyUpData()
 {
 	if( GetDifficulty() == DIFFICULTY_INVALID )
-	{
-		CString sDescription = GetDescription();
-		sDescription.MakeLower();
-		if( sDescription == "beginner" )		SetDifficulty(DIFFICULTY_BEGINNER);
-		else if( sDescription == "easy" )		SetDifficulty(DIFFICULTY_EASY);
-		else if( sDescription == "basic" )		SetDifficulty(DIFFICULTY_EASY);
-		else if( sDescription == "light" )		SetDifficulty(DIFFICULTY_EASY);
-		else if( sDescription == "medium" )		SetDifficulty(DIFFICULTY_MEDIUM);
-		else if( sDescription == "another" )	SetDifficulty(DIFFICULTY_MEDIUM);
-		else if( sDescription == "trick" )		SetDifficulty(DIFFICULTY_MEDIUM);
-		else if( sDescription == "standard" )	SetDifficulty(DIFFICULTY_MEDIUM);
-		else if( sDescription == "hard" )		SetDifficulty(DIFFICULTY_HARD);
-		else if( sDescription == "ssr" )		SetDifficulty(DIFFICULTY_HARD);
-		else if( sDescription == "maniac" )		SetDifficulty(DIFFICULTY_HARD);
-		else if( sDescription == "heavy" )		SetDifficulty(DIFFICULTY_HARD);
-		else if( sDescription == "smaniac" )	SetDifficulty(DIFFICULTY_CHALLENGE);
-		else if( sDescription == "challenge" )	SetDifficulty(DIFFICULTY_CHALLENGE);
-	}
+		SetDifficulty(StringToDifficulty(GetDescription()));
 	
 	if( GetDifficulty() == DIFFICULTY_INVALID )
 	{