diff --git a/stepmania/src/EnumHelper.h b/stepmania/src/EnumHelper.h
index 489638d219..7709be29c5 100644
--- a/stepmania/src/EnumHelper.h
+++ b/stepmania/src/EnumHelper.h
@@ -41,8 +41,9 @@ static inline T enum_add2( T val, int iAmt )
 	return val;
 }
 
-#define FOREACH_ENUM( e, max, var )	for( e var=(e)0; var<NUM_##e; enum_add<e>( var, +1 ) )
-#define FOREACH_ENUM2( e, var )	for( e var=(e)0; var<NUM_##e; enum_add<e>( var, +1 ) )
+#define FOREACH_ENUM_N( e, max, var )	for( e var=(e)0; var<max; enum_add<e>( var, +1 ) )
+#define FOREACH_ENUM( e, var )	for( e var=(e)0; var<NUM_##e; enum_add<e>( var, +1 ) )
+#define FOREACH_ENUM2 FOREACH_ENUM
 
 int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType );
 
diff --git a/stepmania/src/Grade.h b/stepmania/src/Grade.h
index 0aede287c8..93c5d0e46a 100644
--- a/stepmania/src/Grade.h
+++ b/stepmania/src/Grade.h
@@ -53,7 +53,7 @@ RString GradeToLocalizedString( Grade g );
 Grade StringToGrade( const RString &s );
 LuaDeclareType( Grade );
 #define FOREACH_Grade( g ) FOREACH_ENUM2( Grade, g )
-#define FOREACH_UsedGrade( g ) FOREACH_ENUM( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g )
+#define FOREACH_UsedGrade( g ) FOREACH_ENUM_N( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g )
 
 #endif