diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index 017232052b..5003d77fcd 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -64,10 +64,7 @@ static bool IsGameplay()
 }
 
 
-REGISTER_SCREEN_CLASS( ScreenDebugOverlay );
-ScreenDebugOverlay::ScreenDebugOverlay( const CString &sName ) : Screen(sName)
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenDebugOverlay );
 
 ScreenDebugOverlay::~ScreenDebugOverlay()
 {
diff --git a/stepmania/src/ScreenDebugOverlay.h b/stepmania/src/ScreenDebugOverlay.h
index b1d488167a..9aa8e91aad 100644
--- a/stepmania/src/ScreenDebugOverlay.h
+++ b/stepmania/src/ScreenDebugOverlay.h
@@ -10,7 +10,6 @@
 class ScreenDebugOverlay : public Screen
 {
 public:
-	ScreenDebugOverlay( const CString &sName );
 	virtual ~ScreenDebugOverlay();
 	virtual void Init();
 	
diff --git a/stepmania/src/ScreenExit.cpp b/stepmania/src/ScreenExit.cpp
index cb966b75fd..d6b3201bda 100644
--- a/stepmania/src/ScreenExit.cpp
+++ b/stepmania/src/ScreenExit.cpp
@@ -11,10 +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( ScreenExit );
-ScreenExit::ScreenExit( CString sName ): Screen( sName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenExit );
 
 void ScreenExit::Init()
 {
diff --git a/stepmania/src/ScreenExit.h b/stepmania/src/ScreenExit.h
index 085d4ac988..f047103ef1 100644
--- a/stepmania/src/ScreenExit.h
+++ b/stepmania/src/ScreenExit.h
@@ -7,7 +7,6 @@
 class ScreenExit: public Screen
 {
 public:
-	ScreenExit( CString sName );
 	void Init();
 	void Update( float fDelta );
 
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 600c5c5758..b1730e5514 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -85,8 +85,8 @@ float GetClosestCharYPos( float fFakeBeat )
 }
 
 
-REGISTER_SCREEN_CLASS( ScreenNameEntry );
-ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName )
+REGISTER_SCREEN_CLASS_NEW( ScreenNameEntry );
+ScreenNameEntry::ScreenNameEntry()
 {
 		// DEBUGGING STUFF
 //	GAMESTATE->m_CurGame = GAME_DANCE;
diff --git a/stepmania/src/ScreenNameEntry.h b/stepmania/src/ScreenNameEntry.h
index 35075c3a08..e0baae0a12 100644
--- a/stepmania/src/ScreenNameEntry.h
+++ b/stepmania/src/ScreenNameEntry.h
@@ -13,7 +13,7 @@
 class ScreenNameEntry : public Screen
 {
 public:
-	ScreenNameEntry( CString sName );
+	ScreenNameEntry();
 	void Init();
 	virtual ~ScreenNameEntry();
 
diff --git a/stepmania/src/ScreenReloadSongs.cpp b/stepmania/src/ScreenReloadSongs.cpp
index f55b0a8bc6..2ba7dc404f 100644
--- a/stepmania/src/ScreenReloadSongs.cpp
+++ b/stepmania/src/ScreenReloadSongs.cpp
@@ -44,10 +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( ScreenReloadSongs );
-ScreenReloadSongs::ScreenReloadSongs( CString sClassName ): Screen(sClassName)
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenReloadSongs );
 
 void ScreenReloadSongs::Init()
 {
diff --git a/stepmania/src/ScreenReloadSongs.h b/stepmania/src/ScreenReloadSongs.h
index 04dde73509..860bdd28f7 100644
--- a/stepmania/src/ScreenReloadSongs.h
+++ b/stepmania/src/ScreenReloadSongs.h
@@ -8,7 +8,6 @@ class LoadingWindow;
 class ScreenReloadSongs: public Screen
 {
 public:
-	ScreenReloadSongs( CString sClassName );
 	virtual void Init();
 	~ScreenReloadSongs();
 	void Update( float fDeltaTime );
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index 7cc12bedd1..f89953631d 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -13,10 +13,7 @@
 #include "RageLog.h"
 
 
-REGISTER_SCREEN_CLASS( ScreenSandbox );
-ScreenSandbox::ScreenSandbox( CString sClassName ) : Screen( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenSandbox );
 
 void ScreenSandbox::HandleScreenMessage( const ScreenMessage SM )
 {
diff --git a/stepmania/src/ScreenSandbox.h b/stepmania/src/ScreenSandbox.h
index 8aa4b39ea9..8ed74bb5e9 100644
--- a/stepmania/src/ScreenSandbox.h
+++ b/stepmania/src/ScreenSandbox.h
@@ -6,8 +6,6 @@
 class ScreenSandbox : public Screen
 {
 public:
-	ScreenSandbox( CString sName );
-
 	virtual void Input( const InputEventPlus &input );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 	virtual void Update(float f);
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index e6d93e9665..03b9bd276d 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -14,10 +14,7 @@
 
 AutoScreenMessage( SM_PrepScreen )
 
-REGISTER_SCREEN_CLASS( ScreenStage );
-ScreenStage::ScreenStage( CString sClassName ) : Screen( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenStage );
 
 void ScreenStage::Init()
 {
diff --git a/stepmania/src/ScreenStage.h b/stepmania/src/ScreenStage.h
index b4fd440286..e8f8d19ad2 100644
--- a/stepmania/src/ScreenStage.h
+++ b/stepmania/src/ScreenStage.h
@@ -11,7 +11,6 @@
 class ScreenStage : public Screen
 {
 public:
-	ScreenStage( CString sName );
 	virtual void Init();
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );
diff --git a/stepmania/src/ScreenStatsOverlay.cpp b/stepmania/src/ScreenStatsOverlay.cpp
index 65534fac97..9a3c25b9b0 100644
--- a/stepmania/src/ScreenStatsOverlay.cpp
+++ b/stepmania/src/ScreenStatsOverlay.cpp
@@ -6,14 +6,7 @@
 #include "RageLog.h"
 #include "ScreenDimensions.h"
 
-REGISTER_SCREEN_CLASS( ScreenStatsOverlay );
-ScreenStatsOverlay::ScreenStatsOverlay( const CString &sName ) : Screen(sName)
-{
-}
-
-ScreenStatsOverlay::~ScreenStatsOverlay()
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenStatsOverlay );
 
 void ScreenStatsOverlay::Init()
 {
diff --git a/stepmania/src/ScreenStatsOverlay.h b/stepmania/src/ScreenStatsOverlay.h
index e22dbf39b6..ddbbd34eaa 100644
--- a/stepmania/src/ScreenStatsOverlay.h
+++ b/stepmania/src/ScreenStatsOverlay.h
@@ -12,8 +12,6 @@ const int NUM_SKIPS_TO_SHOW = 5;
 class ScreenStatsOverlay : public Screen
 {
 public:
-	ScreenStatsOverlay( const CString &sName );
-	virtual ~ScreenStatsOverlay();
 	virtual void Init();
 	
 	void Update( float fDeltaTime );
diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp
index e2e73fe7b2..7033be4530 100644
--- a/stepmania/src/ScreenSyncOverlay.cpp
+++ b/stepmania/src/ScreenSyncOverlay.cpp
@@ -13,14 +13,7 @@ static bool IsGameplay()
 	return SCREENMAN && SCREENMAN->GetTopScreen() && SCREENMAN->GetTopScreen()->GetScreenType() == gameplay;
 }
 
-REGISTER_SCREEN_CLASS( ScreenSyncOverlay );
-ScreenSyncOverlay::ScreenSyncOverlay( const CString &sName ) : Screen(sName)
-{
-}
-
-ScreenSyncOverlay::~ScreenSyncOverlay()
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenSyncOverlay );
 
 void ScreenSyncOverlay::Init()
 {
diff --git a/stepmania/src/ScreenSyncOverlay.h b/stepmania/src/ScreenSyncOverlay.h
index 975d38288d..5075443768 100644
--- a/stepmania/src/ScreenSyncOverlay.h
+++ b/stepmania/src/ScreenSyncOverlay.h
@@ -10,8 +10,6 @@
 class ScreenSyncOverlay : public Screen
 {
 public:
-	ScreenSyncOverlay( const CString &sName );
-	virtual ~ScreenSyncOverlay();
 	virtual void Init();
 	
 	bool OverlayInput( const InputEventPlus &input );
diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp
index aff7d70181..941a6c145d 100644
--- a/stepmania/src/ScreenTest.cpp
+++ b/stepmania/src/ScreenTest.cpp
@@ -25,8 +25,8 @@ void ScreenTest::SetScreen(int num)
 		current=SCREENMAN->MakeNewScreen("ScreenTestFonts");
 }
 
-REGISTER_SCREEN_CLASS( ScreenTest );
-ScreenTest::ScreenTest( CString sClassName ) : Screen( sClassName )
+REGISTER_SCREEN_CLASS_NEW( ScreenTest );
+ScreenTest::ScreenTest()
 {
 	current = NULL;
 }
diff --git a/stepmania/src/ScreenTest.h b/stepmania/src/ScreenTest.h
index c4fe11aefb..b75320f07a 100644
--- a/stepmania/src/ScreenTest.h
+++ b/stepmania/src/ScreenTest.h
@@ -6,7 +6,7 @@
 class ScreenTest : public Screen
 {
 public:
-	ScreenTest( CString sName );
+	ScreenTest();
 	~ScreenTest();
 	virtual void Init();
 
diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp
index 9288e8c355..06f91828ba 100644
--- a/stepmania/src/ScreenTestFonts.cpp
+++ b/stepmania/src/ScreenTestFonts.cpp
@@ -30,10 +30,7 @@ void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
 		SetText( g_sCustomText );
 }
 
-REGISTER_SCREEN_CLASS( ScreenTestFonts );
-ScreenTestFonts::ScreenTestFonts( CString sClassName ) : Screen( sClassName )
-{
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenTestFonts );
 
 void ScreenTestFonts::Init()
 {
diff --git a/stepmania/src/ScreenTestFonts.h b/stepmania/src/ScreenTestFonts.h
index 033fe9d8d3..7cd35fbe9c 100644
--- a/stepmania/src/ScreenTestFonts.h
+++ b/stepmania/src/ScreenTestFonts.h
@@ -10,7 +10,6 @@
 class ScreenTestFonts: public Screen
 {
 public:
-	ScreenTestFonts( CString sName );
 	virtual void Init();
 
 	void Input( const InputEventPlus &input );
diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp
index 97a152fd65..ce40ee297b 100644
--- a/stepmania/src/ScreenTestSound.cpp
+++ b/stepmania/src/ScreenTestSound.cpp
@@ -7,10 +7,7 @@
 #include "RageUtil.h"
 #include "InputEventPlus.h"
 
-REGISTER_SCREEN_CLASS( ScreenTestSound );
-ScreenTestSound::ScreenTestSound( CString sClassName ) : Screen( sClassName )
-{	
-}
+REGISTER_SCREEN_CLASS_NEW( ScreenTestSound );
 
 void ScreenTestSound::Init()
 {
diff --git a/stepmania/src/ScreenTestSound.h b/stepmania/src/ScreenTestSound.h
index e064466b66..272ca17e26 100644
--- a/stepmania/src/ScreenTestSound.h
+++ b/stepmania/src/ScreenTestSound.h
@@ -10,7 +10,6 @@ const int nsounds = 5;
 class ScreenTestSound : public Screen
 {
 public:
-	ScreenTestSound( CString sName );
 	virtual void Init();
 	~ScreenTestSound();