diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp
index 2fe73839b5..be92cd64e3 100644
--- a/stepmania/src/HoldJudgment.cpp
+++ b/stepmania/src/HoldJudgment.cpp
@@ -96,15 +96,13 @@ void HoldJudgment::HandleMessage( const RString &sMessage )
 class LunaHoldJudgment: public Luna<HoldJudgment>
 {
 public:
-	LunaHoldJudgment() { LUA->Register( Register ); }
-
 	static int LoadFromMultiPlayer( T* p, lua_State *L ) { p->LoadFromMultiPlayer( Enum::Check<MultiPlayer>(L, 1) ); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaHoldJudgment()
 	{
-		ADD_METHOD( LoadFromMultiPlayer );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( LoadFromMultiPlayer );
 	}
 };
 
diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp
index a77fc7744e..ac72a1c742 100644
--- a/stepmania/src/Judgment.cpp
+++ b/stepmania/src/Judgment.cpp
@@ -125,15 +125,13 @@ void Judgment::HandleMessage( const RString &sMessage )
 class LunaJudgment: public Luna<Judgment>
 {
 public:
-	LunaJudgment() { LUA->Register( Register ); }
-
 	static int LoadFromMultiPlayer( T* p, lua_State *L ) { p->LoadFromMultiPlayer( Enum::Check<MultiPlayer>(L, 1) ); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaJudgment()
 	{
-		ADD_METHOD( LoadFromMultiPlayer );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( LoadFromMultiPlayer );
 	}
 };
 
diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp
index 94fa0f18ae..84c015c3d4 100644
--- a/stepmania/src/PaneDisplay.cpp
+++ b/stepmania/src/PaneDisplay.cpp
@@ -319,15 +319,13 @@ void PaneDisplay::SetFocus( PaneTypes NewPane )
 class LunaPaneDisplay: public Luna<PaneDisplay>
 {
 public:
-	LunaPaneDisplay() { LUA->Register( Register ); }
-
 	static int SetFromGameState( T* p, lua_State *L )	{ p->SetFromGameState(); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaPaneDisplay()
 	{
-		ADD_METHOD( SetFromGameState );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( SetFromGameState );
 	}
 };
 
diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp
index 71db86f971..897d1ad419 100644
--- a/stepmania/src/PercentageDisplay.cpp
+++ b/stepmania/src/PercentageDisplay.cpp
@@ -206,8 +206,6 @@ LuaFunction( FormatPercentScore,	PercentageDisplay::FormatPercentScore( FArg(1)
 class LunaPercentageDisplay: public Luna<PercentageDisplay>
 {
 public:
-	LunaPercentageDisplay() { LUA->Register( Register ); }
-
 	static int LoadFromStats( T* p, lua_State *L )
 	{
 		const PlayerState *pStageStats = Luna<PlayerState>::check( L, 1 );
@@ -216,11 +214,11 @@ public:
 		return 0;
 	}
 
-	static void Register(lua_State *L) 
+	LunaPercentageDisplay()
 	{
-		ADD_METHOD( LoadFromStats );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( LoadFromStats );
 	}
 };
 
diff --git a/stepmania/src/RageTexture.cpp b/stepmania/src/RageTexture.cpp
index a664ff1577..61b5f79485 100644
--- a/stepmania/src/RageTexture.cpp
+++ b/stepmania/src/RageTexture.cpp
@@ -73,18 +73,17 @@ const RectF *RageTexture::GetTextureCoordRect( int iFrameNo ) const
 class LunaRageTexture: public Luna<RageTexture>
 {
 public:
-	LunaRageTexture() { LUA->Register( Register ); }
-
 	static int position( T* p, lua_State *L )		{ p->SetPosition( FArg(1) ); return 0; }
 	static int loop( T* p, lua_State *L )			{ p->SetLooping( !!IArg(1) ); return 0; }
 	static int rate( T* p, lua_State *L )			{ p->SetPlaybackRate( FArg(1) ); return 0; }
 
-	static void Register(lua_State *L) {
+	LunaRageTexture()
+	{
+		LUA->Register( Register );
+
 		ADD_METHOD( position );
 		ADD_METHOD( loop );
 		ADD_METHOD( rate );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/ScoreDisplayAliveTime.cpp b/stepmania/src/ScoreDisplayAliveTime.cpp
index a0519bf154..b356be4914 100644
--- a/stepmania/src/ScoreDisplayAliveTime.cpp
+++ b/stepmania/src/ScoreDisplayAliveTime.cpp
@@ -64,11 +64,9 @@ void ScoreDisplayAliveTime::UpdateNumber()
 class LunaScoreDisplayAliveTime: public Luna<ScoreDisplayAliveTime>
 {
 public:
-	LunaScoreDisplayAliveTime() { LUA->Register( Register ); }
-
-	static void Register(lua_State *L) 
+	LunaScoreDisplayAliveTime()
 	{
-		Luna<T>::Register( L );
+		LUA->Register( Register );
 	}
 };
 
diff --git a/stepmania/src/ScoreDisplayCalories.cpp b/stepmania/src/ScoreDisplayCalories.cpp
index b8392f530e..05ce1548ec 100644
--- a/stepmania/src/ScoreDisplayCalories.cpp
+++ b/stepmania/src/ScoreDisplayCalories.cpp
@@ -73,11 +73,9 @@ void ScoreDisplayCalories::UpdateNumber()
 class LunaScoreDisplayCalories: public Luna<ScoreDisplayCalories>
 {
 public:
-	LunaScoreDisplayCalories() { LUA->Register( Register ); }
-
-	static void Register(lua_State *L) 
+	LunaScoreDisplayCalories()
 	{
-		Luna<T>::Register( L );
+		LUA->Register( Register );
 	}
 };
 
diff --git a/stepmania/src/WorkoutGraph.cpp b/stepmania/src/WorkoutGraph.cpp
index 563f066e61..81ca073f78 100644
--- a/stepmania/src/WorkoutGraph.cpp
+++ b/stepmania/src/WorkoutGraph.cpp
@@ -120,17 +120,15 @@ void WorkoutGraph::SetFromGameStateAndHighlightSong( int iSongIndex )
 class LunaWorkoutGraph: public Luna<WorkoutGraph>
 {
 public:
-	LunaWorkoutGraph() { LUA->Register( Register ); }
-
 	static int SetFromGameState( T* p, lua_State *L )			{ p->SetFromGameState(); return 0; }
 	static int SetFromGameStateAndHighlightSong( T* p, lua_State *L )	{ p->SetFromGameStateAndHighlightSong(IArg(1)); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaWorkoutGraph()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( SetFromGameState );
 		ADD_METHOD( SetFromGameStateAndHighlightSong );
-
-		Luna<T>::Register( L );
 	}
 };