diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 95dc988db3..ac4fd6e5c6 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -37,7 +37,7 @@ static const char *HorizAlignNames[] = {
 	"Center",
 	"Right"
 };
-XToString( HorizAlign, NUM_HorizAlign );
+XToString2( HorizAlign );
 LuaXType( HorizAlign );
 
 static const char *VertAlignNames[] = {
@@ -45,7 +45,7 @@ static const char *VertAlignNames[] = {
 	"Middle",
 	"Bottom"
 };
-XToString( VertAlign, NUM_VertAlign );
+XToString2( VertAlign );
 LuaXType( VertAlign );
 
 void Actor::SetBGMTime( float fTime, float fBeat )
diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index 7e74a86cb6..a3fb3ca7bb 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -606,7 +606,7 @@ static const char *FileTypeNames[] = {
 	"Lua", 
 	"Model", 
 };
-XToString( FileType, NUM_FileType );
+XToString2( FileType );
 LuaXType( FileType );
 
 FileType ActorUtil::GetFileType( const RString &sPath )
diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp
index 1afabe8c3e..c72a071066 100644
--- a/stepmania/src/CodeDetector.cpp
+++ b/stepmania/src/CodeDetector.cpp
@@ -52,7 +52,7 @@ const char *CodeNames[] = {
 	"CancelAllPlayerOptions",
 	"BackInEventMode",
 };
-XToString( Code, NUM_Code );
+XToString2( Code );
 
 static CodeItem g_CodeItems[NUM_Code];
 
diff --git a/stepmania/src/ControllerStateDisplay.cpp b/stepmania/src/ControllerStateDisplay.cpp
index 7827a30553..82e386b591 100644
--- a/stepmania/src/ControllerStateDisplay.cpp
+++ b/stepmania/src/ControllerStateDisplay.cpp
@@ -15,7 +15,7 @@ static const char *ControllerStateButtonNames[] = {
 	"Left",
 	"Right",
 };
-XToString( ControllerStateButton, NUM_ControllerStateButton );
+XToString2( ControllerStateButton );
 
 static const DeviceButton ControllerStateButtonToDeviceButton[] = {
 	JOY_UP,
diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 711fee0182..879cb0e41e 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -25,7 +25,7 @@ static const char *CourseTypeNames[] = {
 	"Endless",
 	"Survival",
 };
-XToString( CourseType, NUM_CourseType );
+XToString2( CourseType );
 XToLocalizedString( CourseType );
 LuaXType( CourseType );
 LuaFunction( CourseTypeToLocalizedString, CourseTypeToLocalizedString( Enum::Check<CourseType>( L, 1 ) ) );
@@ -38,7 +38,7 @@ static const char *SongSortNames[] = {
 	"TopGrades",
 	"LowestGrades",
 };
-XToString( SongSort, NUM_SongSort );
+XToString2( SongSort );
 XToLocalizedString( SongSort );
 
 
diff --git a/stepmania/src/DateTime.cpp b/stepmania/src/DateTime.cpp
index 98ad96bf85..bd5afa5528 100644
--- a/stepmania/src/DateTime.cpp
+++ b/stepmania/src/DateTime.cpp
@@ -194,7 +194,7 @@ static const char *MonthNames[] =
 	"November",
 	"December",
 };
-XToString( Month, NUM_Month );
+XToString2( Month );
 XToLocalizedString( Month );
 LuaXType( Month );
 
diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp
index 1c42074c85..2bcf83bb35 100644
--- a/stepmania/src/Difficulty.cpp
+++ b/stepmania/src/Difficulty.cpp
@@ -14,7 +14,7 @@ static const char *DifficultyNames[] = {
 	"Challenge",
 	"Edit",
 };
-XToString( Difficulty, NUM_Difficulty );
+XToString2( Difficulty );
 XToLocalizedString( Difficulty );
 LuaXType( Difficulty );
 
diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 9d90a7a4af..1f75f1e3f8 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -24,7 +24,7 @@ static const char *EditMenuRowNames[] = {
 	"SourceSteps",
 	"Action"
 };
-XToString( EditMenuRow, NUM_EditMenuRow );
+XToString2( EditMenuRow );
 XToLocalizedString( EditMenuRow );
 
 static const char *EditMenuActionNames[] = {
@@ -33,7 +33,7 @@ static const char *EditMenuActionNames[] = {
 	"Create",
 	"Practice",
 };
-XToString( EditMenuAction, NUM_EditMenuAction );
+XToString2( EditMenuAction );
 XToLocalizedString( EditMenuAction );
 StringToX( EditMenuAction );
 
diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 79062b6d23..ede2da3a7b 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -28,7 +28,7 @@ static const char *RadarCategoryNames[] = {
 	"Hands",
 	"Rolls"
 };
-XToString( RadarCategory, NUM_RadarCategory );
+XToString2( RadarCategory );
 XToLocalizedString( RadarCategory );
 LuaFunction( RadarCategoryToLocalizedString, RadarCategoryToLocalizedString(Enum::Check<RadarCategory>(L, 1)) );
 LuaXType( RadarCategory );
@@ -58,7 +58,7 @@ static const char *PlayModeNames[] = {
 	"Battle",
 	"Rave",
 };
-XToString( PlayMode, NUM_PlayMode );
+XToString2( PlayMode );
 XToLocalizedString( PlayMode );
 StringToX( PlayMode );
 LuaFunction( PlayModeToLocalizedString, PlayModeToLocalizedString(Enum::Check<PlayMode>(L, 1)) );
@@ -79,7 +79,7 @@ static const char *RankingCategoryNames[] = {
 	"c",
 	"d",
 };
-XToString( RankingCategory, NUM_RankingCategory );
+XToString2( RankingCategory );
 StringToX( RankingCategory );
 
 
@@ -88,7 +88,7 @@ static const char *PlayerControllerNames[] = {
 	"Autoplay",
 	"Cpu",
 };
-XToString( PlayerController, NUM_PlayerController );
+XToString2( PlayerController );
 StringToX( PlayerController );
 XToLocalizedString( PlayerController );
 LuaXType( PlayerController );
@@ -99,7 +99,7 @@ static const char *CoinModeNames[] = {
 	"Pay",
 	"Free",
 };
-XToString( CoinMode, NUM_CoinMode );
+XToString2( CoinMode );
 StringToX( CoinMode );
 LuaXType( CoinMode );
 
@@ -109,7 +109,7 @@ static const char *PremiumNames[] = {
 	"Double",
 	"Joint",
 };
-XToString( Premium, NUM_Premium );
+XToString2( Premium );
 StringToX( Premium );
 LuaXType( Premium );
 
@@ -134,7 +134,7 @@ static const char *SortOrderNames[] = {
 	"Endless",
 	"Roulette",
 };
-XToString( SortOrder, NUM_SortOrder );
+XToString2( SortOrder );
 StringToX( SortOrder );
 LuaXType( SortOrder );
 
@@ -150,7 +150,7 @@ static const char *TapNoteScoreNames[] = {
 	"W2",
 	"W1",
 };
-XToString( TapNoteScore, NUM_TapNoteScore );
+XToString2( TapNoteScore );
 LuaXType( TapNoteScore );
 TapNoteScore StringToTapNoteScore( const RString &s )
 {
@@ -183,7 +183,7 @@ static const char *HoldNoteScoreNames[] = {
 	"LetGo",
 	"Held",
 };
-XToString( HoldNoteScore, NUM_HoldNoteScore );
+XToString2( HoldNoteScore );
 LuaXType( HoldNoteScore );
 HoldNoteScore StringToHoldNoteScore( const RString &s )
 {
@@ -209,7 +209,7 @@ static const char *MemoryCardStateNames[] = {
 	"removed",
 	"none",
 };
-XToString( MemoryCardState, NUM_MemoryCardState );
+XToString2( MemoryCardState );
 
 
 static const char *PerDifficultyAwardNames[] = {
@@ -224,7 +224,7 @@ static const char *PerDifficultyAwardNames[] = {
 	"Percent90W3",
 	"Percent100W3",
 };
-XToString( PerDifficultyAward, NUM_PerDifficultyAward );
+XToString2( PerDifficultyAward );
 XToLocalizedString( PerDifficultyAward );
 StringToX( PerDifficultyAward );
 LuaFunction( PerDifficultyAwardToLocalizedString, PerDifficultyAwardToLocalizedString(Enum::Check<PerDifficultyAward>(L, 1)) );
@@ -246,7 +246,7 @@ static const char *PeakComboAwardNames[] = {
 	"Peak9000Combo",
 	"Peak10000Combo",
 };
-XToString( PeakComboAward, NUM_PeakComboAward );
+XToString2( PeakComboAward );
 XToLocalizedString( PeakComboAward );
 StringToX( PeakComboAward );
 LuaFunction( PeakComboAwardToLocalizedString, PeakComboAwardToLocalizedString(Enum::Check<PeakComboAward>(L, 1)) );
@@ -304,7 +304,7 @@ static const char *StyleTypeNames[] = {
 	"OnePlayerTwoSides",
 	"TwoPlayersSharedSides",
 };
-XToString( StyleType, NUM_StyleType );
+XToString2( StyleType );
 StringToX( StyleType );
 LuaXType( StyleType );
 
@@ -314,7 +314,7 @@ static const char *GoalTypeNames[] = {
 	"Time",
 	"None",
 };
-XToString( GoalType, NUM_GoalType );
+XToString2( GoalType );
 StringToX( GoalType );
 LuaXType( GoalType );
 
@@ -324,7 +324,7 @@ static const char *EditModeNames[] = {
 	"Home",
 	"Full"
 };
-XToString( EditMode, NUM_EditMode );
+XToString2( EditMode );
 StringToX( EditMode );
 LuaXType( EditMode );
 
@@ -344,7 +344,7 @@ static const char *StageNames[] = {
 	"Event",
 	"Demo",
 };
-XToString( Stage, NUM_Stage );
+XToString2( Stage );
 LuaXType( Stage );
 
 
@@ -354,7 +354,7 @@ static const char *MultiPlayerStatusNames[] = {
 	"Unplugged",
 	"MissingMultitap",
 };
-XToString( MultiPlayerStatus, NUM_MultiPlayerStatus );
+XToString2( MultiPlayerStatus );
 
 
 /*
diff --git a/stepmania/src/GameInput.cpp b/stepmania/src/GameInput.cpp
index 739cf6f3f5..0bd7026c9c 100644
--- a/stepmania/src/GameInput.cpp
+++ b/stepmania/src/GameInput.cpp
@@ -10,7 +10,7 @@ static const char *GameControllerNames[] = {
 	"Controller1",
 	"Controller2",
 };
-XToString( GameController, NUM_GameController );
+XToString2( GameController );
 StringToX( GameController );
 
 
diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index e8b5ef1236..c342b34648 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -33,7 +33,7 @@ static const char *CabinetLightNames[] = {
 	"BassLeft",
 	"BassRight",
 };
-XToString( CabinetLight, NUM_CabinetLight );
+XToString2( CabinetLight );
 StringToX( CabinetLight );
 
 static const char *LightsModeNames[] = {
@@ -47,7 +47,7 @@ static const char *LightsModeNames[] = {
 	"TestAutoCycle",
 	"TestManualCycle",
 };
-XToString( LightsMode, NUM_LightsMode );
+XToString2( LightsMode );
 
 static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
 {
diff --git a/stepmania/src/MenuInput.cpp b/stepmania/src/MenuInput.cpp
index 6f4ae6592e..f304b35073 100644
--- a/stepmania/src/MenuInput.cpp
+++ b/stepmania/src/MenuInput.cpp
@@ -16,7 +16,7 @@ static const char *MenuButtonNames[] =
 	"Coin",
 	"Operator"
 };
-XToString( MenuButton, NUM_MenuButton );
+XToString2( MenuButton );
 XToLocalizedString( MenuButton );
 
 
diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp
index 667384b214..fc625dae30 100644
--- a/stepmania/src/MessageManager.cpp
+++ b/stepmania/src/MessageManager.cpp
@@ -133,7 +133,7 @@ static const char *MessageNames[] = {
 	"ShowHoldJudgmentMuliPlayerP31",
 	"ShowHoldJudgmentMuliPlayerP32",
 };
-XToString( Message, NUM_Message );
+XToString2( Message );
 
 static RageMutex g_Mutex( "MessageManager" );
 
diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index b463b31abd..6b451ef78a 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -26,7 +26,7 @@ static const char *NotePartNames[] = {
 	"HoldBottomCap",
 	"HoldTail",
 };
-XToString( NotePart, NUM_NotePart );
+XToString2( NotePart );
 
 static const RageVector2 g_emptyVector = RageVector2( 0, 0 );
 
@@ -234,13 +234,13 @@ static const char *HoldTypeNames[] = {
 	"hold",
 	"roll",
 };
-XToString( HoldType, NUM_HoldType );
+XToString2( HoldType );
 
 static const char *ActiveTypeNames[] = {
 	"active",
 	"inactive",
 };
-XToString( ActiveType, NUM_ActiveType );
+XToString2( ActiveType );
 
 
 
diff --git a/stepmania/src/NoteTypes.cpp b/stepmania/src/NoteTypes.cpp
index b20474e2df..d9f50c6bb8 100644
--- a/stepmania/src/NoteTypes.cpp
+++ b/stepmania/src/NoteTypes.cpp
@@ -27,7 +27,7 @@ static const char *NoteTypeNames[] = {
 	"64th",
 	"192nd",
 };
-XToString( NoteType, NUM_NoteType );
+XToString2( NoteType );
 LuaXType( NoteType )
 XToLocalizedString( NoteType );
 
diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index a9b1285d9a..bd67d1c8cc 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -33,14 +33,14 @@ static const char *SelectTypeNames[] = {
 	"SelectMultiple",
 	"SelectNone",
 };
-XToString( SelectType, NUM_SelectType );
+XToString2( SelectType );
 StringToX( SelectType );
 
 static const char *LayoutTypeNames[] = {
 	"ShowAllInRow",
 	"ShowOneInRow",
 };
-XToString( LayoutType, NUM_LayoutType );
+XToString2( LayoutType );
 StringToX( LayoutType );
 
 RString OptionRowHandler::OptionTitle() const
diff --git a/stepmania/src/PlayerNumber.cpp b/stepmania/src/PlayerNumber.cpp
index 6510fe91f6..72d6559d58 100644
--- a/stepmania/src/PlayerNumber.cpp
+++ b/stepmania/src/PlayerNumber.cpp
@@ -8,7 +8,7 @@ static const char *PlayerNumberNames[] = {
 	"P1",
 	"P2",
 };
-XToString( PlayerNumber, NUM_PlayerNumber );
+XToString2( PlayerNumber );
 XToLocalizedString( PlayerNumber );
 LuaFunction( PlayerNumberToString, PlayerNumberToString(Enum::Check<PlayerNumber>(L, 1)) );
 LuaXType( PlayerNumber );
@@ -47,7 +47,7 @@ static const char *MultiPlayerNames[] = {
 	"P31",
 	"P32",
 };
-XToString( MultiPlayer, NUM_MultiPlayer );
+XToString2( MultiPlayer );
 XToLocalizedString( MultiPlayer );
 LuaFunction( MultiPlayerToString, MultiPlayerToString(Enum::Check<MultiPlayer>(L, 1)) );
 LuaFunction( MultiPlayerToLocalizedString, MultiPlayerToLocalizedString(Enum::Check<MultiPlayer>(L, 1)) );
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index db4ffa7044..b2c3fd4550 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -29,7 +29,7 @@ static const char *TimingWindowNames[] = {
 	"Hold",
 	"Roll",
 };
-XToString( TimingWindow, NUM_TimingWindow );
+XToString2( TimingWindow );
 
 
 static const char *ScoreEventNames[] = {
@@ -43,7 +43,7 @@ static const char *ScoreEventNames[] = {
 	"Held",
 	"LetGo",
 };
-XToString( ScoreEvent, NUM_ScoreEvent );
+XToString2( ScoreEvent );
 
 
 static const char *MusicWheelUsesSectionsNames[] = {
diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index e2a047f4da..d8406e4532 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -66,7 +66,7 @@ static const char *PixelFormatNames[] = {
 	"BGR8",
 	"A1BGR5",
 };
-XToString( PixelFormat, NUM_PixelFormat );
+XToString2( PixelFormat );
 
 /* bNeedReloadTextures is set to true if the device was re-created and we need
  * to reload textures.  On failure, an error message is returned. 
diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index f6413aedd1..70a30c2046 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -211,7 +211,7 @@ static const char *InputDeviceNames[] = {
 	"Pump2",
 	"Midi",
 };
-XToString( InputDevice, NUM_InputDevice );
+XToString2( InputDevice );
 StringToX( InputDevice );
 
 /* Return a reversible representation of a DeviceInput.  This is not affected by InputDrivers,
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index c11bda4d4c..6c48d5d770 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -82,7 +82,7 @@ static const char *EditStateNames[] = {
 	"RecordPaused",
 	"Playing"
 };
-XToString( EditState, NUM_EditState );
+XToString2( EditState );
 
 #if defined(XBOX)
 void ScreenEdit::InitEditMappings()
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 9e15f4693d..76fc883c60 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -40,14 +40,14 @@ static const char *JudgeLineNames[] =
 {
 	"W1", "W2", "W3", "W4", "W5", "Miss", "Held", "MaxCombo"
 };
-XToString( JudgeLine, NUM_JudgeLine );
+XToString2( JudgeLine );
 #define FOREACH_JudgeLine( rc ) FOREACH_ENUM( JudgeLine, rc )
 
 static const char *StatLineNames[NUM_StatLine] =
 {
 	"Jumps", "Holds", "Mines", "Hands", "Rolls",
 };
-XToString( StatLine, NUM_StatLine );
+XToString2( StatLine );
 #define FOREACH_StatLine( rc ) FOREACH_ENUM( StatLine, rc )
 
 #define CHEER_DELAY_SECONDS		THEME->GetMetricF(m_sName,"CheerDelaySeconds")
diff --git a/stepmania/src/ScreenOptionsEditCourse.cpp b/stepmania/src/ScreenOptionsEditCourse.cpp
index d2ad05d1b1..41d1e6464a 100644
--- a/stepmania/src/ScreenOptionsEditCourse.cpp
+++ b/stepmania/src/ScreenOptionsEditCourse.cpp
@@ -34,7 +34,7 @@ static const char *CourseEntryActionNames[] = {
 	"Insert Entry",
 	"Delete",
 };
-XToString( CourseEntryAction, NUM_CourseEntryAction );
+XToString2( CourseEntryAction );
 #define FOREACH_CourseEntryAction( i ) FOREACH_ENUM( CourseEntryAction, i )
 
 static MenuDef g_TempMenu(
diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp
index 2d0b8c9c57..11bddcbb16 100644
--- a/stepmania/src/ScreenOptionsManageCourses.cpp
+++ b/stepmania/src/ScreenOptionsManageCourses.cpp
@@ -121,7 +121,7 @@ static const char *CourseActionNames[] = {
 	"Rename",
 	"Delete",
 };
-XToString( CourseAction, NUM_CourseAction );
+XToString2( CourseAction );
 #define FOREACH_CourseAction( i ) FOREACH_ENUM( CourseAction, i )
 
 static MenuDef g_TempMenu(
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp
index 976f39ba32..36198d7a98 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.cpp
+++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp
@@ -36,7 +36,7 @@ static const char *StepsEditActionNames[] = {
 	"Rename",
 	"Delete",
 };
-XToString( StepsEditAction, NUM_StepsEditAction );
+XToString2( StepsEditAction );
 #define FOREACH_StepsEditAction( i ) FOREACH_ENUM( StepsEditAction, i )
 
 static MenuDef g_TempMenu(
diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp
index df62dfd716..187c848789 100644
--- a/stepmania/src/ScreenOptionsManageProfiles.cpp
+++ b/stepmania/src/ScreenOptionsManageProfiles.cpp
@@ -40,7 +40,7 @@ static const char *ProfileActionNames[] = {
 	"Delete",
 	"Clear",
 };
-XToString( ProfileAction, NUM_ProfileAction );
+XToString2( ProfileAction );
 XToLocalizedString( ProfileAction );
 #define FOREACH_ProfileAction( i ) FOREACH_ENUM( ProfileAction, i )
 
diff --git a/stepmania/src/ScreenOptionsManageWorkouts.cpp b/stepmania/src/ScreenOptionsManageWorkouts.cpp
index 70b8c822f7..74ea9a0e71 100644
--- a/stepmania/src/ScreenOptionsManageWorkouts.cpp
+++ b/stepmania/src/ScreenOptionsManageWorkouts.cpp
@@ -27,7 +27,7 @@ static const char *ManageWorkoutsActionNames[] = {
 	"Rename",
 	"Delete",
 };
-XToString( ManageWorkoutsAction, NUM_ManageWorkoutsAction );
+XToString2( ManageWorkoutsAction );
 #define FOREACH_ManageWorkoutsAction( i ) FOREACH_ENUM( ManageWorkoutsAction, i )
 
 static MenuDef g_TempMenu(
diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index e7ebbd4734..44d48801bc 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -18,7 +18,7 @@ static const char *PromptAnswerNames[] = {
 	"No",
 	"Cancel",
 };
-XToString( PromptAnswer, NUM_PromptAnswer );
+XToString2( PromptAnswer );
 
 /* Settings: */
 namespace
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 3426e6e7af..d9f6a285d5 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -25,7 +25,7 @@ static const char *PageTypeNames[] = {
 	"SurvivalCourses",
 	"AllCourses",
 };
-XToString( PageType, NUM_PageType );
+XToString2( PageType );
 StringToX( PageType );
 
 #define TYPE						THEME->GetMetric(m_sName,"Type")
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 2f047d07ab..0f76811052 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -21,7 +21,7 @@ static const char *MenuDirNames[] = {
 	"Right",
 	"Auto",
 };
-XToString( MenuDir, NUM_MenuDir );
+XToString2( MenuDir );
 
 AutoScreenMessage( SM_PlayPostSwitchPage )
 
diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp
index 6439c6b01b..d195b61225 100644
--- a/stepmania/src/ScreenSetTime.cpp
+++ b/stepmania/src/ScreenSetTime.cpp
@@ -19,7 +19,7 @@ static const char *SetTimeSelectionNames[] = {
 	"Minute", 
 	"Second", 
 };
-XToString( SetTimeSelection, NUM_SetTimeSelection );
+XToString2( SetTimeSelection );
 #define FOREACH_SetTimeSelection( s ) FOREACH_ENUM( SetTimeSelection, s )
 
 const float g_X[NUM_SetTimeSelection] =
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 1cc4c4bfbe..a8c20eb7d4 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -36,7 +36,7 @@ static const char *ElementCategoryNames[] = {
 	"Sounds",
 	"Other"
 };
-XToString( ElementCategory, NUM_ElementCategory );
+XToString2( ElementCategory );
 StringToX( ElementCategory );
 
 
diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp
index b729910c1c..fbc9d82429 100644
--- a/stepmania/src/UnlockManager.cpp
+++ b/stepmania/src/UnlockManager.cpp
@@ -33,7 +33,7 @@ static const char *UnlockRequirementNames[] =
 	"Toasties",
 	"StagesCleared"
 };
-XToString( UnlockRequirement, NUM_UnlockRequirement );
+XToString2( UnlockRequirement );
 StringToX( UnlockRequirement );
 LuaXType( UnlockRequirement );
 
@@ -44,7 +44,7 @@ static const char *UnlockRewardTypeNames[] =
 	"Course",
 	"Modifier",
 };
-XToString( UnlockRewardType, NUM_UnlockRewardType );
+XToString2( UnlockRewardType );
 XToLocalizedString( UnlockRewardType );
 LuaXType( UnlockRewardType );
 LuaFunction( UnlockRewardTypeToLocalizedString, UnlockRewardTypeToLocalizedString(Enum::Check<UnlockRewardType>(L, 1)) );
diff --git a/stepmania/src/Workout.cpp b/stepmania/src/Workout.cpp
index d79f0c5136..72f974ee06 100644
--- a/stepmania/src/Workout.cpp
+++ b/stepmania/src/Workout.cpp
@@ -16,7 +16,7 @@ static const char *WorkoutProgramNames[] = {
 	"Runner",
 	"Flat",
 };
-XToString( WorkoutProgram, NUM_WorkoutProgram );
+XToString2( WorkoutProgram );
 StringToX( WorkoutProgram );
 XToLocalizedString( WorkoutProgram );
 
@@ -25,7 +25,7 @@ static const char *WorkoutStepsTypeNames[] = {
 	"NormalSteps",
 	"WorkoutSteps"
 };
-XToString( WorkoutStepsType, NUM_WorkoutStepsType );
+XToString2( WorkoutStepsType );
 StringToX( WorkoutStepsType );
 XToLocalizedString( WorkoutStepsType );
 LuaXType( WorkoutStepsType );