diff --git a/stepmania/src/Screen.h b/stepmania/src/Screen.h
index 9a82294f10..f9074bb3b8 100644
--- a/stepmania/src/Screen.h
+++ b/stepmania/src/Screen.h
@@ -17,13 +17,6 @@ void RegisterScreenClass( const CString& sClassName, CreateScreenFn pfn );
 
 // Each Screen class should have a REGISTER_SCREEN_CLASS in its CPP file.
 #define REGISTER_SCREEN_CLASS( className ) \
-	static Screen* Create##className( const CString &sName ) { Screen *pRet = new className( sName ); Screen::InitScreen( pRet ); return pRet; } \
-	struct Register##className { \
-		Register##className() { RegisterScreenClass( #className,Create##className); } \
-	}; \
-	static Register##className register_##className;
-
-#define REGISTER_SCREEN_CLASS_NEW( className ) \
 	static Screen* Create##className( const CString &sName ) { Screen *pRet = new className; pRet->SetName( sName ); Screen::InitScreen( pRet ); return pRet; } \
 	struct Register##className { \
 		Register##className() { RegisterScreenClass( #className,Create##className); } \
diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 29f0c9017e..3e04de88f0 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -20,7 +20,7 @@
 
 ThemeMetric<bool>	BACK_GOES_TO_START_SCREEN( "ScreenAttract", "BackGoesToStartScreen" );
 
-REGISTER_SCREEN_CLASS_NEW( ScreenAttract );
+REGISTER_SCREEN_CLASS( ScreenAttract );
 ScreenAttract::ScreenAttract( bool bResetGameState )
 {
 	if( bResetGameState )
diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp
index d090843f25..8f0dccfb80 100644
--- a/stepmania/src/ScreenBookkeeping.cpp
+++ b/stepmania/src/ScreenBookkeeping.cpp
@@ -10,7 +10,7 @@
 #include "LocalizedString.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenBookkeeping );
+REGISTER_SCREEN_CLASS( ScreenBookkeeping );
 
 void ScreenBookkeeping::Init()
 {
diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp
index 102f303d45..db8b094cf1 100644
--- a/stepmania/src/ScreenCenterImage.cpp
+++ b/stepmania/src/ScreenCenterImage.cpp
@@ -13,7 +13,7 @@
 
 static ThemeMetric<bool>	ALLOW_RESIZE("ScreenCenterImage","AllowResize");
 
-REGISTER_SCREEN_CLASS_NEW( ScreenCenterImage );
+REGISTER_SCREEN_CLASS( ScreenCenterImage );
 
 void ScreenCenterImage::Init()
 {
diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp
index aee79652a1..a260b7b059 100644
--- a/stepmania/src/ScreenCredits.cpp
+++ b/stepmania/src/ScreenCredits.cpp
@@ -4,7 +4,7 @@
 #include "AnnouncerManager.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenCredits );
+REGISTER_SCREEN_CLASS( ScreenCredits );
 
 void ScreenCredits::Init()
 {
diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index 5003d77fcd..5dfd9d2c67 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -64,7 +64,7 @@ static bool IsGameplay()
 }
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenDebugOverlay );
+REGISTER_SCREEN_CLASS( ScreenDebugOverlay );
 
 ScreenDebugOverlay::~ScreenDebugOverlay()
 {
diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index ef6cc6bebc..7a4f0ccaab 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -15,7 +15,7 @@
 #define SECONDS_TO_SHOW			THEME->GetMetricF(m_sName,"SecondsToShow")
 #define ALLOW_STYLE_TYPES		THEME->GetMetric (m_sName,"AllowStyleTypes")
 
-REGISTER_SCREEN_CLASS_NEW( ScreenDemonstration );
+REGISTER_SCREEN_CLASS( ScreenDemonstration );
 ScreenDemonstration::ScreenDemonstration()
 {
 	m_bDemonstration = true;
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 0e42a4820c..496d51ad3b 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -612,7 +612,7 @@ static int g_iLastInsertTapAttackTrack = -1;
 static float g_fLastInsertAttackDurationSeconds = -1;
 static BackgroundLayer g_CurrentBGChangeLayer = BACKGROUND_LAYER_INVALID;
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEdit );
+REGISTER_SCREEN_CLASS( ScreenEdit );
 
 void ScreenEdit::Init()
 {
diff --git a/stepmania/src/ScreenEditCourseMods.cpp b/stepmania/src/ScreenEditCourseMods.cpp
index c22c126fa7..7af421ec52 100644
--- a/stepmania/src/ScreenEditCourseMods.cpp
+++ b/stepmania/src/ScreenEditCourseMods.cpp
@@ -2,7 +2,7 @@
 #include "ScreenEditCourseMods.h"
 #include "RageLog.h"
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEditCourseMods );
+REGISTER_SCREEN_CLASS( ScreenEditCourseMods );
 
 void ScreenEditCourseMods::Init()
 {
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 9723d6e047..7374a9e4c5 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -22,7 +22,7 @@
 AutoScreenMessage( SM_RefreshSelector )
 AutoScreenMessage( SM_BackFromEditDescription )
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEditMenu );
+REGISTER_SCREEN_CLASS( ScreenEditMenu );
 
 void ScreenEditMenu::Init()
 {
diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp
index 26c5b8c302..08f0ab1e79 100644
--- a/stepmania/src/ScreenEnding.cpp
+++ b/stepmania/src/ScreenEnding.cpp
@@ -126,7 +126,7 @@ CString GetStatsLineValue( PlayerNumber pn, EndingStatsLine line )
 }
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEnding );
+REGISTER_SCREEN_CLASS( ScreenEnding );
 ScreenEnding::ScreenEnding() : ScreenAttract( false/*dont reset GAMESTATE*/ )
 {
 	if( PREFSMAN->m_bScreenTestMode )
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index af2698ec24..c9e4afb56e 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -81,7 +81,7 @@ static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
 AutoScreenMessage( SM_PlayCheer )
 AutoScreenMessage( SM_AddBonus )
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEvaluation );
+REGISTER_SCREEN_CLASS( ScreenEvaluation );
 ScreenEvaluation::ScreenEvaluation()
 {
 	//
diff --git a/stepmania/src/ScreenEvaluationMultiplayer.cpp b/stepmania/src/ScreenEvaluationMultiplayer.cpp
index 4d50164f31..ed1e25128f 100644
--- a/stepmania/src/ScreenEvaluationMultiplayer.cpp
+++ b/stepmania/src/ScreenEvaluationMultiplayer.cpp
@@ -106,7 +106,7 @@ public:
 };
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEvaluationMultiplayer );
+REGISTER_SCREEN_CLASS( ScreenEvaluationMultiplayer );
 ScreenEvaluationMultiplayer::ScreenEvaluationMultiplayer()
 {
 	//
diff --git a/stepmania/src/ScreenExit.cpp b/stepmania/src/ScreenExit.cpp
index d6b3201bda..ead78a4e82 100644
--- a/stepmania/src/ScreenExit.cpp
+++ b/stepmania/src/ScreenExit.cpp
@@ -11,7 +11,7 @@
  * is annoying, because sounds might be deleted at any time; they aren't ours to have
  * references to.  Also, it's better to quit on command instead of waiting several seconds
  * for a sound to stop. */
-REGISTER_SCREEN_CLASS_NEW( ScreenExit );
+REGISTER_SCREEN_CLASS( ScreenExit );
 
 void ScreenExit::Init()
 {
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index a1ca8ccb1c..8a712e03a8 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -69,7 +69,7 @@ const float TWEEN_TIME		= 0.5f;
 
 AutoScreenMessage( SM_NoSongs )
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEz2SelectMusic );
+REGISTER_SCREEN_CLASS( ScreenEz2SelectMusic );
 
 void ScreenEz2SelectMusic::Init()
 {
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 985fe7aa32..444cefb403 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -27,7 +27,7 @@
 const float TWEEN_TIME		= 0.35f;
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenEz2SelectPlayer );
+REGISTER_SCREEN_CLASS( ScreenEz2SelectPlayer );
 
 void ScreenEz2SelectPlayer::Init()
 {
diff --git a/stepmania/src/ScreenGameplayLesson.cpp b/stepmania/src/ScreenGameplayLesson.cpp
index 84ed6e69be..bacb8655db 100644
--- a/stepmania/src/ScreenGameplayLesson.cpp
+++ b/stepmania/src/ScreenGameplayLesson.cpp
@@ -5,7 +5,7 @@
 #include "PrefsManager.h"
 #include "StatsManager.h"
 
-REGISTER_SCREEN_CLASS_NEW( ScreenGameplayLesson );
+REGISTER_SCREEN_CLASS( ScreenGameplayLesson );
 ScreenGameplayLesson::ScreenGameplayLesson()
 {
 	m_iCurrentPageIndex = 0;
diff --git a/stepmania/src/ScreenGameplayMultiplayer.cpp b/stepmania/src/ScreenGameplayMultiplayer.cpp
index b6bfdf7c37..0a3b7f4beb 100644
--- a/stepmania/src/ScreenGameplayMultiplayer.cpp
+++ b/stepmania/src/ScreenGameplayMultiplayer.cpp
@@ -3,7 +3,7 @@
 #include "GameState.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenGameplayMultiplayer );
+REGISTER_SCREEN_CLASS( ScreenGameplayMultiplayer );
 
 void ScreenGameplayMultiplayer::Init()
 {
diff --git a/stepmania/src/ScreenGameplayNormal.cpp b/stepmania/src/ScreenGameplayNormal.cpp
index 19f75a0048..697952b952 100644
--- a/stepmania/src/ScreenGameplayNormal.cpp
+++ b/stepmania/src/ScreenGameplayNormal.cpp
@@ -2,7 +2,7 @@
 #include "ScreenGameplayNormal.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenGameplayNormal );
+REGISTER_SCREEN_CLASS( ScreenGameplayNormal );
 
 void ScreenGameplayNormal::FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut )
 {
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index 21b656a7a8..af2534610e 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -65,7 +65,7 @@ static bool HaveAllCharAnimations()
 	return true;
 }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenHowToPlay );
+REGISTER_SCREEN_CLASS( ScreenHowToPlay );
 ScreenHowToPlay::ScreenHowToPlay()
 {
 	m_iW2s = 0;
diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp
index 1fd3ec044d..fa52b53a74 100644
--- a/stepmania/src/ScreenInstructions.cpp
+++ b/stepmania/src/ScreenInstructions.cpp
@@ -2,7 +2,7 @@
 #include "ScreenInstructions.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenInstructions );
+REGISTER_SCREEN_CLASS( ScreenInstructions );
 
 void ScreenInstructions::Init()
 {
diff --git a/stepmania/src/ScreenJoinMultiplayer.cpp b/stepmania/src/ScreenJoinMultiplayer.cpp
index bc9b760bf1..1f83a4b781 100644
--- a/stepmania/src/ScreenJoinMultiplayer.cpp
+++ b/stepmania/src/ScreenJoinMultiplayer.cpp
@@ -24,7 +24,7 @@ static const char *MultiPlayerStatusNames[] = {
 XToString( MultiPlayerStatus, NUM_MultiPlayerStatus );
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenJoinMultiplayer );
+REGISTER_SCREEN_CLASS( ScreenJoinMultiplayer );
 ScreenJoinMultiplayer::ScreenJoinMultiplayer()
 {
 	FOREACH_MultiPlayer( p )
diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index 430ba1bfc0..0a15bd8986 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -22,7 +22,7 @@
 
 #define SHOW_COURSE_MODIFIERS_PROBABILITY	THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")
 
-REGISTER_SCREEN_CLASS_NEW( ScreenJukebox );
+REGISTER_SCREEN_CLASS( ScreenJukebox );
 void ScreenJukebox::SetSong()
 {
 	ThemeMetric<bool>				ALLOW_ADVANCED_MODIFIERS(m_sName,"AllowAdvancedModifiers");
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 1ad36bb48c..25508faa7b 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -23,7 +23,7 @@ static const float g_fSecondsToWaitForInput = 0.05f;
 // reserve the 3rd slot for hard-coded keys
 static const int NUM_CHANGABLE_SLOTS = NUM_SHOWN_GAME_TO_DEVICE_SLOTS-1;
 
-REGISTER_SCREEN_CLASS_NEW( ScreenMapControllers );
+REGISTER_SCREEN_CLASS( ScreenMapControllers );
 
 void ScreenMapControllers::Init()
 {
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index fd2e6496bc..08907c1792 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -21,7 +21,7 @@ const CString CREDIT_LINES[] =
 const unsigned NUM_CREDIT_LINES = sizeof(CREDIT_LINES) / sizeof(CString);
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenMusicScroll );
+REGISTER_SCREEN_CLASS( ScreenMusicScroll );
 
 void ScreenMusicScroll::Init()
 {
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index b1730e5514..1e26698639 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -85,7 +85,7 @@ float GetClosestCharYPos( float fFakeBeat )
 }
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenNameEntry );
+REGISTER_SCREEN_CLASS( ScreenNameEntry );
 ScreenNameEntry::ScreenNameEntry()
 {
 		// DEBUGGING STUFF
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index cf1ce2217c..de684f22f1 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -131,7 +131,7 @@ float HighScoreWheel::Scroll()
 	return GetTweenTimeLeft();
 }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenNameEntryTraditional );
+REGISTER_SCREEN_CLASS( ScreenNameEntryTraditional );
 ScreenNameEntryTraditional::ScreenNameEntryTraditional():
 	CHANGE_COMMAND("stoptweening;decelerate,.12")
 {
diff --git a/stepmania/src/ScreenNetEvaluation.cpp b/stepmania/src/ScreenNetEvaluation.cpp
index 09485bc1c8..643e15a9f2 100644
--- a/stepmania/src/ScreenNetEvaluation.cpp
+++ b/stepmania/src/ScreenNetEvaluation.cpp
@@ -19,7 +19,7 @@ const int NUM_SCORE_DIGITS	=	9;
 
 AutoScreenMessage( SM_GotEval ) 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenNetEvaluation );
+REGISTER_SCREEN_CLASS( ScreenNetEvaluation );
 
 void ScreenNetEvaluation::Init()
 {
diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp
index 2c2eb011c7..2e2fe61db9 100644
--- a/stepmania/src/ScreenNetRoom.cpp
+++ b/stepmania/src/ScreenNetRoom.cpp
@@ -28,7 +28,7 @@ AutoScreenMessage( SM_SMOnlinePack )
 AutoScreenMessage( SM_BackFromRoomName )
 AutoScreenMessage( SM_BackFromRoomDesc )
 
-REGISTER_SCREEN_CLASS_NEW( ScreenNetRoom );
+REGISTER_SCREEN_CLASS( ScreenNetRoom );
 
 void ScreenNetRoom::Init()
 {
diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp
index ef6f398304..5168da0dec 100644
--- a/stepmania/src/ScreenNetSelectBase.cpp
+++ b/stepmania/src/ScreenNetSelectBase.cpp
@@ -32,7 +32,7 @@ AutoScreenMessage( SM_AddToChat )
 AutoScreenMessage( SM_UsersUpdate )
 AutoScreenMessage( SM_SMOnlinePack )
 
-REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectBase );
+REGISTER_SCREEN_CLASS( ScreenNetSelectBase );
 
 void ScreenNetSelectBase::Init()
 {
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 7428561973..dec037d72e 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -37,7 +37,7 @@ const CString AllGroups			= "[ALL MUSIC]";
 #define DIFFBG_WIDTH				THEME->GetMetricF(m_sName,"DiffBGWidth")
 #define DIFFBG_HEIGHT				THEME->GetMetricF(m_sName,"DiffBGHeight")
 
-REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectMusic );
+REGISTER_SCREEN_CLASS( ScreenNetSelectMusic );
 
 void ScreenNetSelectMusic::Init()
 {
diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp
index f5254c82dd..33e62c1967 100644
--- a/stepmania/src/ScreenNetworkOptions.cpp
+++ b/stepmania/src/ScreenNetworkOptions.cpp
@@ -44,7 +44,7 @@ AutoScreenMessage( SM_ServerNameEnter )
 
 Preference<CString> g_sLastServer( "LastConnectedServer",	"" );
 
-REGISTER_SCREEN_CLASS_NEW( ScreenNetworkOptions );
+REGISTER_SCREEN_CLASS( ScreenNetworkOptions );
 
 void ScreenNetworkOptions::Init()
 {
diff --git a/stepmania/src/ScreenOptionsEditCourse.cpp b/stepmania/src/ScreenOptionsEditCourse.cpp
index 4b44dac20b..80a61151b0 100644
--- a/stepmania/src/ScreenOptionsEditCourse.cpp
+++ b/stepmania/src/ScreenOptionsEditCourse.cpp
@@ -40,7 +40,7 @@ static MenuDef g_TempMenu(
 	"ScreenMiniMenuContext"
 );
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourse );
+REGISTER_SCREEN_CLASS( ScreenOptionsEditCourse );
 
 void ScreenOptionsEditCourse::Init()
 {
diff --git a/stepmania/src/ScreenOptionsEditCourseEntry.cpp b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
index b17821199e..e6d0e2fcbd 100644
--- a/stepmania/src/ScreenOptionsEditCourseEntry.cpp
+++ b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
@@ -45,7 +45,7 @@ static void FillSongsAndChoices( const CString &sSongGroup, vector<Song*> &vpSon
 }
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourseEntry );
+REGISTER_SCREEN_CLASS( ScreenOptionsEditCourseEntry );
 
 void ScreenOptionsEditCourseEntry::Init()
 {
diff --git a/stepmania/src/ScreenOptionsEditProfile.cpp b/stepmania/src/ScreenOptionsEditProfile.cpp
index f69e5e1216..2e022b5083 100644
--- a/stepmania/src/ScreenOptionsEditProfile.cpp
+++ b/stepmania/src/ScreenOptionsEditProfile.cpp
@@ -16,7 +16,7 @@ enum EditProfileRow
 	ROW_CHARACTER,
 };
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditProfile );
+REGISTER_SCREEN_CLASS( ScreenOptionsEditProfile );
 
 void ScreenOptionsEditProfile::Init()
 {
diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp
index ec38bd163e..c45de89dec 100644
--- a/stepmania/src/ScreenOptionsManageCourses.cpp
+++ b/stepmania/src/ScreenOptionsManageCourses.cpp
@@ -127,7 +127,7 @@ static bool ValidateEditCourseName( const CString &sAnswer, CString &sErrorOut )
 }
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageCourses );
+REGISTER_SCREEN_CLASS( ScreenOptionsManageCourses );
 
 void ScreenOptionsManageCourses::Init()
 {
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp
index 08cf612d5d..9cad5c5a0f 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.cpp
+++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp
@@ -64,7 +64,7 @@ static bool ValidateEditStepsDescription( const CString &sAnswer, CString &sErro
 }
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageEditSteps );
+REGISTER_SCREEN_CLASS( ScreenOptionsManageEditSteps );
 
 void ScreenOptionsManageEditSteps::Init()
 {
diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp
index 6a9e363155..544d1d1242 100644
--- a/stepmania/src/ScreenOptionsManageProfiles.cpp
+++ b/stepmania/src/ScreenOptionsManageProfiles.cpp
@@ -74,7 +74,7 @@ static bool ValidateLocalProfileName( const CString &sAnswer, CString &sErrorOut
 	return true;
 }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageProfiles );
+REGISTER_SCREEN_CLASS( ScreenOptionsManageProfiles );
 
 ScreenOptionsManageProfiles::~ScreenOptionsManageProfiles()
 {
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 83a683495c..b00ff96662 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -21,7 +21,7 @@
 #define LINE(sLineName)				THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMaster );
+REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
 
 void ScreenOptionsMaster::Init()
 {
diff --git a/stepmania/src/ScreenOptionsMemoryCard.cpp b/stepmania/src/ScreenOptionsMemoryCard.cpp
index 649fbe59f7..1529aa6085 100644
--- a/stepmania/src/ScreenOptionsMemoryCard.cpp
+++ b/stepmania/src/ScreenOptionsMemoryCard.cpp
@@ -9,7 +9,7 @@
 #include "LocalizedString.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMemoryCard );
+REGISTER_SCREEN_CLASS( ScreenOptionsMemoryCard );
 
 void ScreenOptionsMemoryCard::Init()
 {
diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp
index b670f50540..32ccb20859 100644
--- a/stepmania/src/ScreenPackages.cpp
+++ b/stepmania/src/ScreenPackages.cpp
@@ -21,7 +21,7 @@
 
 AutoScreenMessage( SM_BackFromURL )
 
-REGISTER_SCREEN_CLASS_NEW( ScreenPackages );
+REGISTER_SCREEN_CLASS( ScreenPackages );
 
 void ScreenPackages::Init()
 {
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index cfb2e2c19f..ea4a11f897 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -15,7 +15,7 @@
 #include "Foreach.h"
 #include "InputEventPlus.h"
 
-REGISTER_SCREEN_CLASS_NEW( ScreenPlayerOptions );
+REGISTER_SCREEN_CLASS( ScreenPlayerOptions );
 
 void ScreenPlayerOptions::Init()
 {
diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index a34f6a0c94..20b06f46fd 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -45,7 +45,7 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom
 
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenPrompt );
+REGISTER_SCREEN_CLASS( ScreenPrompt );
 
 void ScreenPrompt::Init()
 {
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 28b22884be..1b9df3f02c 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -84,9 +84,9 @@ static void GetAllCoursesToShow( vector<Course*> &vpOut, CourseType ct, bool bSh
 
 static CString STEPS_TYPE_COLOR_NAME( size_t i ) { return ssprintf("StepsTypeColor%d",int(i+1)); }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenRanking );
-REGISTER_SCREEN_CLASS_NEW( ScreenRankingScroller );
-REGISTER_SCREEN_CLASS_NEW( ScreenRankingLines );
+REGISTER_SCREEN_CLASS( ScreenRanking );
+REGISTER_SCREEN_CLASS( ScreenRankingScroller );
+REGISTER_SCREEN_CLASS( ScreenRankingLines );
 
 ScreenRanking::ScreenRanking():
 	ScreenAttract( false /*dont reset GAMESTATE*/ )
diff --git a/stepmania/src/ScreenReloadSongs.cpp b/stepmania/src/ScreenReloadSongs.cpp
index 2ba7dc404f..1ea312af18 100644
--- a/stepmania/src/ScreenReloadSongs.cpp
+++ b/stepmania/src/ScreenReloadSongs.cpp
@@ -44,7 +44,7 @@ public:
  * this for the initial load, since we don't want to start up the display
  * until we finish loading songs; that way, people can continue to use their
  * computer while songs load. */
-REGISTER_SCREEN_CLASS_NEW( ScreenReloadSongs );
+REGISTER_SCREEN_CLASS( ScreenReloadSongs );
 
 void ScreenReloadSongs::Init()
 {
diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp
index 0a5eb5c0df..6d3e36fc23 100644
--- a/stepmania/src/ScreenSMOnlineLogin.cpp
+++ b/stepmania/src/ScreenSMOnlineLogin.cpp
@@ -15,7 +15,7 @@
 #include "Profile.h"
 #include "LocalizedString.h"
 
-REGISTER_SCREEN_CLASS_NEW(ScreenSMOnlineLogin);
+REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
 
 AutoScreenMessage( SM_SMOnlinePack )
 AutoScreenMessage( SM_PasswordDone )
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index f89953631d..66d4ad91b4 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -13,7 +13,7 @@
 #include "RageLog.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSandbox );
+REGISTER_SCREEN_CLASS( ScreenSandbox );
 
 void ScreenSandbox::HandleScreenMessage( const ScreenMessage SM )
 {
diff --git a/stepmania/src/ScreenSaveSync.cpp b/stepmania/src/ScreenSaveSync.cpp
index a91d3fc90e..a2977a8ff6 100644
--- a/stepmania/src/ScreenSaveSync.cpp
+++ b/stepmania/src/ScreenSaveSync.cpp
@@ -115,7 +115,7 @@ static void RevertSyncChanges( void* pThrowAway )
 	GAMESTATE->RevertSyncChanges();
 }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSaveSync );
+REGISTER_SCREEN_CLASS( ScreenSaveSync );
 void ScreenSaveSync::Init()
 {
 	ScreenPrompt::Init();
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index 9a90ae637b..ddebba7f0f 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -46,7 +46,7 @@ const PlayerNumber	CPU_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
 
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSelectCharacter );
+REGISTER_SCREEN_CLASS( ScreenSelectCharacter );
 
 
 void ScreenSelectCharacter::Init()
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index d48ef5b64a..f87bdeb01b 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -26,7 +26,7 @@
 
 #define IGNORED_ELEMENT_COMMAND				THEME->GetMetricA(m_sName,"IgnoredElementOnCommand")
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSelectDifficulty );
+REGISTER_SCREEN_CLASS( ScreenSelectDifficulty );
 
 void ScreenSelectDifficulty::Init()
 {
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 1a0c06aaa9..365c1cb6c6 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -22,7 +22,7 @@
 #define BANNER_HEIGHT					THEME->GetMetricF("ScreenSelectGroup","BannerHeight")
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSelectGroup );
+REGISTER_SCREEN_CLASS( ScreenSelectGroup );
 
 static LocalizedString ALL_MUSIC_STRING( "ScreenSelectGroup", "ALL MUSIC" );
 void ScreenSelectGroup::Init()
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 5a1fa6cb6b..eaa802d5d4 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -21,7 +21,7 @@ CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dO
 /* e.g. "OptionOrderLeft=0:1,1:2,2:3,3:4" */
 CString OPTION_ORDER_NAME( size_t dir )							{ return "OptionOrder"+MenuDirToString((MenuDir)dir); }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSelectMaster );
+REGISTER_SCREEN_CLASS( ScreenSelectMaster );
 
 void ScreenSelectMaster::Init()
 {
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index 63c088cdd6..90d489c8cd 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -31,7 +31,7 @@ ScreenSelectMode (Constructor)
 Desc: Sets up the screen display
 ************************************/
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSelectMode );
+REGISTER_SCREEN_CLASS( ScreenSelectMode );
 
 void ScreenSelectMode::Init()
 {
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 1e5e6f8f64..f2b641a34c 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -50,7 +50,7 @@ static bool g_bBannerWaiting = false;
 static bool g_bSampleMusicWaiting = false;
 static RageTimer g_StartedLoadingAt(RageZeroTimer);
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSelectMusic );
+REGISTER_SCREEN_CLASS( ScreenSelectMusic );
 ScreenSelectMusic::ScreenSelectMusic()
 {
 	if( PREFSMAN->m_bScreenTestMode )
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index 13827fe1bc..fe3192d7ee 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -19,7 +19,7 @@
 #define DISABLED_COMMAND			THEME->GetMetricA(m_sName,"DisabledCommand")
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSelectStyle );
+REGISTER_SCREEN_CLASS( ScreenSelectStyle );
 
 void ScreenSelectStyle::Init()
 {
diff --git a/stepmania/src/ScreenServiceAction.cpp b/stepmania/src/ScreenServiceAction.cpp
index 4923786677..2faef7997d 100644
--- a/stepmania/src/ScreenServiceAction.cpp
+++ b/stepmania/src/ScreenServiceAction.cpp
@@ -448,7 +448,7 @@ static CString ResetPreferences()
 
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenServiceAction );
+REGISTER_SCREEN_CLASS( ScreenServiceAction );
 void ScreenServiceAction::Init()
 {
 	ScreenPrompt::Init();
diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp
index ffc5546131..d8f96b9683 100644
--- a/stepmania/src/ScreenSetTime.cpp
+++ b/stepmania/src/ScreenSetTime.cpp
@@ -37,7 +37,7 @@ static float GetTitleY( SetTimeSelection s ) { return g_Y[s]; }
 static float GetValueX( SetTimeSelection s ) { return g_X[s] + 80; }
 static float GetValueY( SetTimeSelection s ) { return g_Y[s]; }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSetTime );
+REGISTER_SCREEN_CLASS( ScreenSetTime );
 
 void ScreenSetTime::Init()
 {
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 154edfa11f..3702815108 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -5,7 +5,7 @@
 #include "ThemeManager.h"
 #include "PrefsManager.h"
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSongOptions );
+REGISTER_SCREEN_CLASS( ScreenSongOptions );
 
 void ScreenSongOptions::Init()
 {
diff --git a/stepmania/src/ScreenSplash.cpp b/stepmania/src/ScreenSplash.cpp
index 63001a1caa..61d1c3787a 100644
--- a/stepmania/src/ScreenSplash.cpp
+++ b/stepmania/src/ScreenSplash.cpp
@@ -7,7 +7,7 @@
 AutoScreenMessage( SM_PrepScreen )
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSplash );
+REGISTER_SCREEN_CLASS( ScreenSplash );
 
 void ScreenSplash::Init()
 {
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index 03b9bd276d..c7b5332ecd 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -14,7 +14,7 @@
 
 AutoScreenMessage( SM_PrepScreen )
 
-REGISTER_SCREEN_CLASS_NEW( ScreenStage );
+REGISTER_SCREEN_CLASS( ScreenStage );
 
 void ScreenStage::Init()
 {
diff --git a/stepmania/src/ScreenStatsOverlay.cpp b/stepmania/src/ScreenStatsOverlay.cpp
index 9a3c25b9b0..63b56a66cf 100644
--- a/stepmania/src/ScreenStatsOverlay.cpp
+++ b/stepmania/src/ScreenStatsOverlay.cpp
@@ -6,7 +6,7 @@
 #include "RageLog.h"
 #include "ScreenDimensions.h"
 
-REGISTER_SCREEN_CLASS_NEW( ScreenStatsOverlay );
+REGISTER_SCREEN_CLASS( ScreenStatsOverlay );
 
 void ScreenStatsOverlay::Init()
 {
diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp
index 7033be4530..0ad8d18da4 100644
--- a/stepmania/src/ScreenSyncOverlay.cpp
+++ b/stepmania/src/ScreenSyncOverlay.cpp
@@ -13,7 +13,7 @@ static bool IsGameplay()
 	return SCREENMAN && SCREENMAN->GetTopScreen() && SCREENMAN->GetTopScreen()->GetScreenType() == gameplay;
 }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSyncOverlay );
+REGISTER_SCREEN_CLASS( ScreenSyncOverlay );
 
 void ScreenSyncOverlay::Init()
 {
diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp
index e2f94002cf..c31330b15a 100644
--- a/stepmania/src/ScreenSystemLayer.cpp
+++ b/stepmania/src/ScreenSystemLayer.cpp
@@ -14,7 +14,7 @@
 #include "ScreenDimensions.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenSystemLayer );
+REGISTER_SCREEN_CLASS( ScreenSystemLayer );
 void ScreenSystemLayer::Init()
 {
 	SubscribeToMessage( "RefreshCreditText" );
diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp
index 941a6c145d..cf69650a78 100644
--- a/stepmania/src/ScreenTest.cpp
+++ b/stepmania/src/ScreenTest.cpp
@@ -25,7 +25,7 @@ void ScreenTest::SetScreen(int num)
 		current=SCREENMAN->MakeNewScreen("ScreenTestFonts");
 }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenTest );
+REGISTER_SCREEN_CLASS( ScreenTest );
 ScreenTest::ScreenTest()
 {
 	current = NULL;
diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp
index 06f91828ba..0462a26a9f 100644
--- a/stepmania/src/ScreenTestFonts.cpp
+++ b/stepmania/src/ScreenTestFonts.cpp
@@ -30,7 +30,7 @@ void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
 		SetText( g_sCustomText );
 }
 
-REGISTER_SCREEN_CLASS_NEW( ScreenTestFonts );
+REGISTER_SCREEN_CLASS( ScreenTestFonts );
 
 void ScreenTestFonts::Init()
 {
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index c1b4102674..daffc80a76 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -14,7 +14,7 @@
 #include "LocalizedString.h"
 
 
-REGISTER_SCREEN_CLASS_NEW( ScreenTestInput );
+REGISTER_SCREEN_CLASS( ScreenTestInput );
 
 void ScreenTestInput::Init()
 {
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index 1044f53e77..336e217293 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -11,7 +11,7 @@
 #include "InputEventPlus.h"
 #include "LocalizedString.h"
 
-REGISTER_SCREEN_CLASS_NEW( ScreenTestLights );
+REGISTER_SCREEN_CLASS( ScreenTestLights );
 
 void ScreenTestLights::Init()
 {
diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp
index ce40ee297b..f04cad9394 100644
--- a/stepmania/src/ScreenTestSound.cpp
+++ b/stepmania/src/ScreenTestSound.cpp
@@ -7,7 +7,7 @@
 #include "RageUtil.h"
 #include "InputEventPlus.h"
 
-REGISTER_SCREEN_CLASS_NEW( ScreenTestSound );
+REGISTER_SCREEN_CLASS( ScreenTestSound );
 
 void ScreenTestSound::Init()
 {
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 03ecccff37..4076f953f3 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -71,7 +71,7 @@ bool ScreenTextEntry::s_bCancelledLast = false;
  * XXX: Don't allow internal-use codepoints (above 0xFFFF); those are
  * subject to change and shouldn't be written to disk.
  */
-REGISTER_SCREEN_CLASS_NEW( ScreenTextEntry );
+REGISTER_SCREEN_CLASS( ScreenTextEntry );
 
 void ScreenTextEntry::Init()
 {
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index b8588baf08..d17f628d2f 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -22,7 +22,7 @@
 
 #define COIN_MODE_CHANGE_SCREEN		THEME->GetMetric (m_sName,"CoinModeChangeScreen")
 
-REGISTER_SCREEN_CLASS_NEW( ScreenTitleMenu );
+REGISTER_SCREEN_CLASS( ScreenTitleMenu );
 ScreenTitleMenu::ScreenTitleMenu()
 {
 	/* XXX We really need two common calls: 1, something run when exiting from gameplay
diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp
index fce431f3af..5ef7b33b08 100644
--- a/stepmania/src/ScreenUnlock.cpp
+++ b/stepmania/src/ScreenUnlock.cpp
@@ -24,7 +24,7 @@
 #define TIME_TO_DISPLAY					THEME->GetMetricF("ScreenUnlock", "TimeToDisplay")
 #define POINTS_ZOOM						THEME->GetMetricF("ScreenUnlock","PointsZoom")
 
-REGISTER_SCREEN_CLASS_NEW( ScreenUnlock );
+REGISTER_SCREEN_CLASS( ScreenUnlock );
 
 void ScreenUnlock::Init()
 {