diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index b083977f6c..f753789919 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -1418,132 +1418,132 @@ public:
 	static int GetName( T* p, lua_State *L )			{ lua_pushstring( L, p->GetName() ); return 1; }
 
 	static void Register(lua_State *L) {
-  		ADD_METHOD( sleep )
-		ADD_METHOD( linear )
-		ADD_METHOD( accelerate )
-		ADD_METHOD( decelerate )
-		ADD_METHOD( smooth )
-		ADD_METHOD( bouncebegin )
-		ADD_METHOD( bounceend )
-		ADD_METHOD( spring )
-		ADD_METHOD( stoptweening )
-		ADD_METHOD( finishtweening )
-		ADD_METHOD( hurrytweening )
-		ADD_METHOD( x )
-		ADD_METHOD( y )
-		ADD_METHOD( z )
-		ADD_METHOD( addx )
-		ADD_METHOD( addy )
-		ADD_METHOD( addz )
-		ADD_METHOD( zoom )
-		ADD_METHOD( zoomx )
-		ADD_METHOD( zoomy )
-		ADD_METHOD( zoomz )
-		ADD_METHOD( zoomto )
-		ADD_METHOD( zoomtowidth )
-		ADD_METHOD( zoomtoheight )
-		ADD_METHOD( basezoomx )
-		ADD_METHOD( basezoomy )
-		ADD_METHOD( stretchto )
-		ADD_METHOD( cropleft )
-		ADD_METHOD( croptop )
-		ADD_METHOD( cropright )
-		ADD_METHOD( cropbottom )
-		ADD_METHOD( fadeleft )
-		ADD_METHOD( fadetop )
-		ADD_METHOD( faderight )
-		ADD_METHOD( fadebottom )
-		ADD_METHOD( diffuse )
-		ADD_METHOD( diffuseupperleft )
-		ADD_METHOD( diffuseupperright )
-		ADD_METHOD( diffuselowerleft )
-		ADD_METHOD( diffuselowerright )
-		ADD_METHOD( diffuseleftedge )
-		ADD_METHOD( diffuserightedge )
-		ADD_METHOD( diffusetopedge )
-		ADD_METHOD( diffusebottomedge )
-		ADD_METHOD( diffusealpha )
-		ADD_METHOD( diffusecolor )
-		ADD_METHOD( glow )
-		ADD_METHOD( aux )
-		ADD_METHOD( getaux )
-		ADD_METHOD( rotationx )
-		ADD_METHOD( rotationy )
-		ADD_METHOD( rotationz )
-		ADD_METHOD( getrotation )
-		ADD_METHOD( baserotationx )
-		ADD_METHOD( baserotationy )
-		ADD_METHOD( baserotationz )
-		ADD_METHOD( skewx )
-		ADD_METHOD( heading )
-		ADD_METHOD( pitch )
-		ADD_METHOD( roll )
-		ADD_METHOD( shadowlength )
-		ADD_METHOD( horizalign )
-		ADD_METHOD( vertalign )
-		ADD_METHOD( luaeffect )
-		ADD_METHOD( diffuseblink )
-		ADD_METHOD( diffuseshift )
-		ADD_METHOD( diffuseramp )
-		ADD_METHOD( glowblink )
-		ADD_METHOD( glowshift )
-		ADD_METHOD( rainbow )
-		ADD_METHOD( wag )
-		ADD_METHOD( bounce )
-		ADD_METHOD( bob )
-		ADD_METHOD( pulse )
-		ADD_METHOD( spin )
-		ADD_METHOD( vibrate )
-		ADD_METHOD( stopeffect )
-		ADD_METHOD( effectcolor1 )
-		ADD_METHOD( effectcolor2 )
-		ADD_METHOD( effectperiod )
-		ADD_METHOD( effecttiming )
-		ADD_METHOD( effectoffset )
-		ADD_METHOD( effectclock )
-		ADD_METHOD( effectmagnitude )
-		ADD_METHOD( geteffectmagnitude )
-		ADD_METHOD( scaletocover )
-		ADD_METHOD( scaletofit )
-		ADD_METHOD( animate )
-		ADD_METHOD( play )
-		ADD_METHOD( pause )
-		ADD_METHOD( setstate )
-		ADD_METHOD( texturewrapping )
-		ADD_METHOD( additiveblend )
-		ADD_METHOD( blend )
-		ADD_METHOD( zbuffer )
-		ADD_METHOD( ztest )
-		ADD_METHOD( ztestmode )
-		ADD_METHOD( zwrite )
-		ADD_METHOD( zbias )
-		ADD_METHOD( clearzbuffer )
-		ADD_METHOD( backfacecull )
-		ADD_METHOD( cullmode )
-		ADD_METHOD( visible )
-		ADD_METHOD( hidden )
-		ADD_METHOD( hibernate )
-		ADD_METHOD( draworder )
-		ADD_METHOD( playcommand )
-		ADD_METHOD( queuecommand )
-		ADD_METHOD( queuemessage )
+  		ADD_METHOD( sleep );
+		ADD_METHOD( linear );
+		ADD_METHOD( accelerate );
+		ADD_METHOD( decelerate );
+		ADD_METHOD( smooth );
+		ADD_METHOD( bouncebegin );
+		ADD_METHOD( bounceend );
+		ADD_METHOD( spring );
+		ADD_METHOD( stoptweening );
+		ADD_METHOD( finishtweening );
+		ADD_METHOD( hurrytweening );
+		ADD_METHOD( x );
+		ADD_METHOD( y );
+		ADD_METHOD( z );
+		ADD_METHOD( addx );
+		ADD_METHOD( addy );
+		ADD_METHOD( addz );
+		ADD_METHOD( zoom );
+		ADD_METHOD( zoomx );
+		ADD_METHOD( zoomy );
+		ADD_METHOD( zoomz );
+		ADD_METHOD( zoomto );
+		ADD_METHOD( zoomtowidth );
+		ADD_METHOD( zoomtoheight );
+		ADD_METHOD( basezoomx );
+		ADD_METHOD( basezoomy );
+		ADD_METHOD( stretchto );
+		ADD_METHOD( cropleft );
+		ADD_METHOD( croptop );
+		ADD_METHOD( cropright );
+		ADD_METHOD( cropbottom );
+		ADD_METHOD( fadeleft );
+		ADD_METHOD( fadetop );
+		ADD_METHOD( faderight );
+		ADD_METHOD( fadebottom );
+		ADD_METHOD( diffuse );
+		ADD_METHOD( diffuseupperleft );
+		ADD_METHOD( diffuseupperright );
+		ADD_METHOD( diffuselowerleft );
+		ADD_METHOD( diffuselowerright );
+		ADD_METHOD( diffuseleftedge );
+		ADD_METHOD( diffuserightedge );
+		ADD_METHOD( diffusetopedge );
+		ADD_METHOD( diffusebottomedge );
+		ADD_METHOD( diffusealpha );
+		ADD_METHOD( diffusecolor );
+		ADD_METHOD( glow );
+		ADD_METHOD( aux );
+		ADD_METHOD( getaux );
+		ADD_METHOD( rotationx );
+		ADD_METHOD( rotationy );
+		ADD_METHOD( rotationz );
+		ADD_METHOD( getrotation );
+		ADD_METHOD( baserotationx );
+		ADD_METHOD( baserotationy );
+		ADD_METHOD( baserotationz );
+		ADD_METHOD( skewx );
+		ADD_METHOD( heading );
+		ADD_METHOD( pitch );
+		ADD_METHOD( roll );
+		ADD_METHOD( shadowlength );
+		ADD_METHOD( horizalign );
+		ADD_METHOD( vertalign );
+		ADD_METHOD( luaeffect );
+		ADD_METHOD( diffuseblink );
+		ADD_METHOD( diffuseshift );
+		ADD_METHOD( diffuseramp );
+		ADD_METHOD( glowblink );
+		ADD_METHOD( glowshift );
+		ADD_METHOD( rainbow );
+		ADD_METHOD( wag );
+		ADD_METHOD( bounce );
+		ADD_METHOD( bob );
+		ADD_METHOD( pulse );
+		ADD_METHOD( spin );
+		ADD_METHOD( vibrate );
+		ADD_METHOD( stopeffect );
+		ADD_METHOD( effectcolor1 );
+		ADD_METHOD( effectcolor2 );
+		ADD_METHOD( effectperiod );
+		ADD_METHOD( effecttiming );
+		ADD_METHOD( effectoffset );
+		ADD_METHOD( effectclock );
+		ADD_METHOD( effectmagnitude );
+		ADD_METHOD( geteffectmagnitude );
+		ADD_METHOD( scaletocover );
+		ADD_METHOD( scaletofit );
+		ADD_METHOD( animate );
+		ADD_METHOD( play );
+		ADD_METHOD( pause );
+		ADD_METHOD( setstate );
+		ADD_METHOD( texturewrapping );
+		ADD_METHOD( additiveblend );
+		ADD_METHOD( blend );
+		ADD_METHOD( zbuffer );
+		ADD_METHOD( ztest );
+		ADD_METHOD( ztestmode );
+		ADD_METHOD( zwrite );
+		ADD_METHOD( zbias );
+		ADD_METHOD( clearzbuffer );
+		ADD_METHOD( backfacecull );
+		ADD_METHOD( cullmode );
+		ADD_METHOD( visible );
+		ADD_METHOD( hidden );
+		ADD_METHOD( hibernate );
+		ADD_METHOD( draworder );
+		ADD_METHOD( playcommand );
+		ADD_METHOD( queuecommand );
+		ADD_METHOD( queuemessage );
 
-		ADD_METHOD( GetX )
-		ADD_METHOD( GetY )
-		ADD_METHOD( GetZ )
-		ADD_METHOD( GetWidth )
-		ADD_METHOD( GetHeight )
-		ADD_METHOD( GetZoom )
-		ADD_METHOD( GetZoomX )
-		ADD_METHOD( GetZoomY )
-		ADD_METHOD( GetZoomZ )
-		ADD_METHOD( GetRotationY )
-		ADD_METHOD( GetBaseZoomX )
-		ADD_METHOD( GetSecsIntoEffect )
-		ADD_METHOD( GetEffectDelta )
-		ADD_METHOD( GetDiffuseAlpha )
+		ADD_METHOD( GetX );
+		ADD_METHOD( GetY );
+		ADD_METHOD( GetZ );
+		ADD_METHOD( GetWidth );
+		ADD_METHOD( GetHeight );
+		ADD_METHOD( GetZoom );
+		ADD_METHOD( GetZoomX );
+		ADD_METHOD( GetZoomY );
+		ADD_METHOD( GetZoomZ );
+		ADD_METHOD( GetRotationY );
+		ADD_METHOD( GetBaseZoomX );
+		ADD_METHOD( GetSecsIntoEffect );
+		ADD_METHOD( GetEffectDelta );
+		ADD_METHOD( GetDiffuseAlpha );
 
-		ADD_METHOD( GetName )
+		ADD_METHOD( GetName );
 
 		Luna<T>::Register( L );
 	}
diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp
index 7ffc2bf492..05bec547a3 100644
--- a/stepmania/src/ActorFrame.cpp
+++ b/stepmania/src/ActorFrame.cpp
@@ -393,14 +393,14 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( propagate )
-		ADD_METHOD( fov )
-		ADD_METHOD( SetUpdateRate )
-		ADD_METHOD( SetFOV )
-		ADD_METHOD( vanishpoint )
-		ADD_METHOD( GetChild )
-		ADD_METHOD( GetNumChildren )
-		ADD_METHOD( SetDrawByZPosition )
+		ADD_METHOD( propagate );
+		ADD_METHOD( fov );
+		ADD_METHOD( SetUpdateRate );
+		ADD_METHOD( SetFOV );
+		ADD_METHOD( vanishpoint );
+		ADD_METHOD( GetChild );
+		ADD_METHOD( GetNumChildren );
+		ADD_METHOD( SetDrawByZPosition );
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index 729d331148..3684dd3301 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -299,7 +299,7 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( SetCurrentAndDestinationItem )
+		ADD_METHOD( SetCurrentAndDestinationItem );
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/ActorSound.cpp b/stepmania/src/ActorSound.cpp
index 9338e45c9e..fce3086581 100644
--- a/stepmania/src/ActorSound.cpp
+++ b/stepmania/src/ActorSound.cpp
@@ -47,8 +47,8 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( load )
-		ADD_METHOD( play )
+		ADD_METHOD( load );
+		ADD_METHOD( play );
 
 		Luna<T>::Register( L );
 	}
diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index 59ecbf058a..31684b1050 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -850,11 +850,11 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( wrapwidthpixels )
-		ADD_METHOD( maxwidth )
-		ADD_METHOD( maxheight )
-		ADD_METHOD( settext )
-		ADD_METHOD( GetText )
+		ADD_METHOD( wrapwidthpixels );
+		ADD_METHOD( maxwidth );
+		ADD_METHOD( maxheight );
+		ADD_METHOD( settext );
+		ADD_METHOD( GetText );
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/Character.cpp b/stepmania/src/Character.cpp
index 8fffa1e0a8..ecd9c6e5a0 100644
--- a/stepmania/src/Character.cpp
+++ b/stepmania/src/Character.cpp
@@ -210,10 +210,11 @@ public:
 	
 	static void Register( Lua *L )
 	{
-		ADD_METHOD( GetCardPath )
-		ADD_METHOD( GetIconPath )
-		ADD_METHOD( GetSongSelectIconPath )
-		ADD_METHOD( GetStageIconPath )
+		ADD_METHOD( GetCardPath );
+		ADD_METHOD( GetIconPath );
+		ADD_METHOD( GetSongSelectIconPath );
+		ADD_METHOD( GetStageIconPath );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/CharacterManager.cpp b/stepmania/src/CharacterManager.cpp
index b49199856b..80824c5a93 100644
--- a/stepmania/src/CharacterManager.cpp
+++ b/stepmania/src/CharacterManager.cpp
@@ -124,7 +124,8 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetCharacter )
+		ADD_METHOD( GetCharacter );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/ComboGraph.cpp b/stepmania/src/ComboGraph.cpp
index 658a7bba7a..7e79dab2de 100644
--- a/stepmania/src/ComboGraph.cpp
+++ b/stepmania/src/ComboGraph.cpp
@@ -124,7 +124,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( LoadFromStats )
+		ADD_METHOD( LoadFromStats );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 9e776adf4e..6e11a90af6 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -114,7 +114,7 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetSong )
+		ADD_METHOD( GetSong );
 
 		Luna<T>::Register( L );
 	}
@@ -1017,12 +1017,12 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetPlayMode )
-		ADD_METHOD( GetDisplayFullTitle )
-		ADD_METHOD( GetTranslitFullTitle )
-		ADD_METHOD( HasMods )
-		ADD_METHOD( GetCourseType )
-		ADD_METHOD( GetCourseEntry )
+		ADD_METHOD( GetPlayMode );
+		ADD_METHOD( GetDisplayFullTitle );
+		ADD_METHOD( GetTranslitFullTitle );
+		ADD_METHOD( HasMods );
+		ADD_METHOD( GetCourseType );
+		ADD_METHOD( GetCourseEntry );
 
 		Luna<T>::Register( L );
 	}
diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp
index c76f8e43f3..2424fa5c1f 100644
--- a/stepmania/src/CourseContentsList.cpp
+++ b/stepmania/src/CourseContentsList.cpp
@@ -124,7 +124,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( SetFromGameState )
+		ADD_METHOD( SetFromGameState );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp
index d0d236d251..bc6821d92f 100644
--- a/stepmania/src/CourseEntryDisplay.cpp
+++ b/stepmania/src/CourseEntryDisplay.cpp
@@ -186,7 +186,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( SetFromGameState )
+		ADD_METHOD( SetFromGameState );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp
index 57765ede82..45bdab2e2c 100644
--- a/stepmania/src/DifficultyMeter.cpp
+++ b/stepmania/src/DifficultyMeter.cpp
@@ -291,10 +291,11 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( Load )
-		ADD_METHOD( SetFromMeterAndDifficulty )
-		ADD_METHOD( SetFromSteps )
-		ADD_METHOD( SetFromTrail )
+		ADD_METHOD( Load );
+		ADD_METHOD( SetFromMeterAndDifficulty );
+		ADD_METHOD( SetFromSteps );
+		ADD_METHOD( SetFromTrail );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp
index 65f2fc026b..6182470f97 100644
--- a/stepmania/src/FadingBanner.cpp
+++ b/stepmania/src/FadingBanner.cpp
@@ -271,12 +271,13 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( scaletoclipped )
-		ADD_METHOD( ScaleToClipped )
-		ADD_METHOD( LoadFromSong )
-		ADD_METHOD( LoadFromCourse )
-		ADD_METHOD( LoadIconFromCharacter )
-		ADD_METHOD( LoadCardFromCharacter )
+		ADD_METHOD( scaletoclipped );
+		ADD_METHOD( ScaleToClipped );
+		ADD_METHOD( LoadFromSong );
+		ADD_METHOD( LoadFromCourse );
+		ADD_METHOD( LoadIconFromCharacter );
+		ADD_METHOD( LoadCardFromCharacter );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/Game.cpp b/stepmania/src/Game.cpp
index f427d87156..8d71b39bb1 100644
--- a/stepmania/src/Game.cpp
+++ b/stepmania/src/Game.cpp
@@ -125,7 +125,8 @@ public:
 	static int GetName( T* p, lua_State *L )			{ lua_pushstring( L, p->m_szName ); return 1; }
 	static void Register( Lua *L )
 	{
-  		ADD_METHOD( GetName )
+  		ADD_METHOD( GetName );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index 71fb349f77..c235bf1e3e 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -1162,12 +1162,12 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetName )
-		ADD_METHOD( GetText )
-		ADD_METHOD( GetIndex )
-		ADD_METHOD( GetMultiPlayer )
-		ADD_METHOD( GetProfileID )
-		ADD_METHOD( GetSong )
+		ADD_METHOD( GetName );
+		ADD_METHOD( GetText );
+		ADD_METHOD( GetIndex );
+		ADD_METHOD( GetMultiPlayer );
+		ADD_METHOD( GetProfileID );
+		ADD_METHOD( GetSong );
 
 		Luna<T>::Register( L );
 	}
diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp
index e6353b0037..ffb0d736e5 100644
--- a/stepmania/src/GameManager.cpp
+++ b/stepmania/src/GameManager.cpp
@@ -2829,8 +2829,8 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( StepsTypeToThemedString )
-		ADD_METHOD( GetFirstStepsTypeForCurrentGame )
+		ADD_METHOD( StepsTypeToThemedString );
+		ADD_METHOD( GetFirstStepsTypeForCurrentGame );
 
 		Luna<T>::Register( L );
 
diff --git a/stepmania/src/GameSoundManager.cpp b/stepmania/src/GameSoundManager.cpp
index 03b1371f12..271990e6bf 100644
--- a/stepmania/src/GameSoundManager.cpp
+++ b/stepmania/src/GameSoundManager.cpp
@@ -739,8 +739,9 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( DimMusic )
-		ADD_METHOD( PlayOnce )
+		ADD_METHOD( DimMusic );
+		ADD_METHOD( PlayOnce );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 5dfbb84310..ec9c3fe98c 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1901,15 +1901,17 @@ class LunaGameState: public Luna<GameState>
 public:
 	LunaGameState() { LUA->Register( Register ); }
 
-	static int IsPlayerEnabled( T* p, lua_State *L )		{ lua_pushboolean(L, p->IsPlayerEnabled((PlayerNumber)IArg(1)) ); return 1; }
-	static int IsHumanPlayer( T* p, lua_State *L )			{ lua_pushboolean(L, p->IsHumanPlayer((PlayerNumber)IArg(1)) ); return 1; }
-	static int GetPlayerDisplayName( T* p, lua_State *L )	{ lua_pushstring(L, p->GetPlayerDisplayName((PlayerNumber)IArg(1)) ); return 1; }
-	static int GetMasterPlayerNumber( T* p, lua_State *L )	{ lua_pushnumber(L, p->m_MasterPlayerNumber ); return 1; }
-	static int GetMultiplayer( T* p, lua_State *L )			{ lua_pushboolean(L, p->m_bMultiplayer); return 1; }
-	static int GetPlayerState( T* p, lua_State *L )			{ 
+	DEFINE_METHOD( IsPlayerEnabled,			IsPlayerEnabled((PlayerNumber)IArg(1)) )
+	DEFINE_METHOD( IsHumanPlayer,			IsHumanPlayer((PlayerNumber)IArg(1)) )
+	DEFINE_METHOD( GetPlayerDisplayName,	GetPlayerDisplayName((PlayerNumber)IArg(1)) )
+	DEFINE_METHOD( GetMasterPlayerNumber,	m_MasterPlayerNumber )
+	DEFINE_METHOD( GetMultiplayer,			m_bMultiplayer )
+	static int GetPlayerState( T* p, lua_State *L )
+	{ 
 		PlayerNumber pn = (PlayerNumber)IArg(1);
-		p->m_pPlayerState[pn]->PushSelf(L);return 1; }
-
+		p->m_pPlayerState[pn]->PushSelf(L);
+		return 1;
+	}
 	static int ApplyGameCommand( T* p, lua_State *L )
 	{
 		PlayerNumber pn = PLAYER_INVALID;
@@ -2037,63 +2039,63 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( IsPlayerEnabled )
-		ADD_METHOD( IsHumanPlayer )
-		ADD_METHOD( GetPlayerDisplayName )
-		ADD_METHOD( GetMasterPlayerNumber )
-		ADD_METHOD( GetMultiplayer )
-		ADD_METHOD( GetPlayerState )
-		ADD_METHOD( ApplyGameCommand )
-		ADD_METHOD( GetCurrentSong )
-		ADD_METHOD( SetCurrentSong )
-		ADD_METHOD( GetCurrentSteps )
-		ADD_METHOD( SetCurrentSteps )
-		ADD_METHOD( GetCurrentCourse )
-		ADD_METHOD( SetCurrentCourse )
-		ADD_METHOD( GetCurrentTrail )
-		ADD_METHOD( SetPreferredSong )
-		ADD_METHOD( GetPreferredSong )
-		ADD_METHOD( SetTemporaryEventMode )
-		ADD_METHOD( Env )
-		ADD_METHOD( SetEnv )
-		ADD_METHOD( GetEnv )
-		ADD_METHOD( GetEditSourceSteps )
-		ADD_METHOD( GetPreferredDifficulty )
-		ADD_METHOD( AnyPlayerHasRankingFeats )
-		ADD_METHOD( IsCourseMode )
-		ADD_METHOD( IsDemonstration )
-		ADD_METHOD( GetPlayMode )
-		ADD_METHOD( GetSortOrder )
-		ADD_METHOD( StageIndex )
-		ADD_METHOD( IsGoalComplete )
-		ADD_METHOD( PlayerIsUsingModifier )
-		ADD_METHOD( GetCourseSongIndex )
-		ADD_METHOD( IsFinalStage )
-		ADD_METHOD( IsExtraStage )
-		ADD_METHOD( IsExtraStage2 )
-		ADD_METHOD( GetCurrentStage )
-		ADD_METHOD( IsStagePossible )
-		ADD_METHOD( HasEarnedExtraStage )
-		ADD_METHOD( GetEasiestStepsDifficulty )
-		ADD_METHOD( IsEventMode )
-		ADD_METHOD( GetNumPlayersEnabled )
-		ADD_METHOD( GetSongBeat )
-		ADD_METHOD( PlayerUsingBothSides )
-		ADD_METHOD( GetCoins )
-		ADD_METHOD( IsSideJoined )
-		ADD_METHOD( GetCoinsNeededToJoin )
-		ADD_METHOD( PlayersCanJoin )
-		ADD_METHOD( GetNumSidesJoined )
-		ADD_METHOD( GetCoinMode )
-		ADD_METHOD( GetPremium )
-		ADD_METHOD( GetSongOptionsString )
-		ADD_METHOD( IsSyncDataChanged )
-		ADD_METHOD( IsWinner )
-		ADD_METHOD( IsDisqualified )
-		ADD_METHOD( GetCurrentGame )
-		ADD_METHOD( GetEditCourseEntryIndex )
-		ADD_METHOD( GetEditLocalProfileID )
-		ADD_METHOD( GetEditLocalProfile )
+		ADD_METHOD( IsPlayerEnabled );
+		ADD_METHOD( IsHumanPlayer );
+		ADD_METHOD( GetPlayerDisplayName );
+		ADD_METHOD( GetMasterPlayerNumber );
+		ADD_METHOD( GetMultiplayer );
+		ADD_METHOD( GetPlayerState );
+		ADD_METHOD( ApplyGameCommand );
+		ADD_METHOD( GetCurrentSong );
+		ADD_METHOD( SetCurrentSong );
+		ADD_METHOD( GetCurrentSteps );
+		ADD_METHOD( SetCurrentSteps );
+		ADD_METHOD( GetCurrentCourse );
+		ADD_METHOD( SetCurrentCourse );
+		ADD_METHOD( GetCurrentTrail );
+		ADD_METHOD( SetPreferredSong );
+		ADD_METHOD( GetPreferredSong );
+		ADD_METHOD( SetTemporaryEventMode );
+		ADD_METHOD( Env );
+		ADD_METHOD( SetEnv );
+		ADD_METHOD( GetEnv );
+		ADD_METHOD( GetEditSourceSteps );
+		ADD_METHOD( GetPreferredDifficulty );
+		ADD_METHOD( AnyPlayerHasRankingFeats );
+		ADD_METHOD( IsCourseMode );
+		ADD_METHOD( IsDemonstration );
+		ADD_METHOD( GetPlayMode );
+		ADD_METHOD( GetSortOrder );
+		ADD_METHOD( StageIndex );
+		ADD_METHOD( IsGoalComplete );
+		ADD_METHOD( PlayerIsUsingModifier );
+		ADD_METHOD( GetCourseSongIndex );
+		ADD_METHOD( IsFinalStage );
+		ADD_METHOD( IsExtraStage );
+		ADD_METHOD( IsExtraStage2 );
+		ADD_METHOD( GetCurrentStage );
+		ADD_METHOD( IsStagePossible );
+		ADD_METHOD( HasEarnedExtraStage );
+		ADD_METHOD( GetEasiestStepsDifficulty );
+		ADD_METHOD( IsEventMode );
+		ADD_METHOD( GetNumPlayersEnabled );
+		ADD_METHOD( GetSongBeat );
+		ADD_METHOD( PlayerUsingBothSides );
+		ADD_METHOD( GetCoins );
+		ADD_METHOD( IsSideJoined );
+		ADD_METHOD( GetCoinsNeededToJoin );
+		ADD_METHOD( PlayersCanJoin );
+		ADD_METHOD( GetNumSidesJoined );
+		ADD_METHOD( GetCoinMode );
+		ADD_METHOD( GetPremium );
+		ADD_METHOD( GetSongOptionsString );
+		ADD_METHOD( IsSyncDataChanged );
+		ADD_METHOD( IsWinner );
+		ADD_METHOD( IsDisqualified );
+		ADD_METHOD( GetCurrentGame );
+		ADD_METHOD( GetEditCourseEntryIndex );
+		ADD_METHOD( GetEditLocalProfileID );
+		ADD_METHOD( GetEditLocalProfile );
 
 		Luna<T>::Register( L );
 
diff --git a/stepmania/src/GraphDisplay.cpp b/stepmania/src/GraphDisplay.cpp
index 95d175f437..68f6639534 100644
--- a/stepmania/src/GraphDisplay.cpp
+++ b/stepmania/src/GraphDisplay.cpp
@@ -308,7 +308,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( LoadFromStats )
+		ADD_METHOD( LoadFromStats );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp
index a81a7fdfe7..3eaf24c00b 100644
--- a/stepmania/src/HelpDisplay.cpp
+++ b/stepmania/src/HelpDisplay.cpp
@@ -128,8 +128,9 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( settips )
-		ADD_METHOD( gettips )
+		ADD_METHOD( settips );
+		ADD_METHOD( gettips );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/LuaBinding.h b/stepmania/src/LuaBinding.h
index 99678d389a..99812f07b8 100644
--- a/stepmania/src/LuaBinding.h
+++ b/stepmania/src/LuaBinding.h
@@ -248,7 +248,11 @@ protected:
 	/* Call PushSelf, so we always call the derived Luna<T>::Push. */ \
 	namespace LuaHelpers { template<> void Push( T *pObject, lua_State *L ) { pObject->PushSelf( L ); } }
 
-#define ADD_METHOD( method_name ) AddMethod( #method_name, method_name );
+#define DEFINE_METHOD( method_name, expr ) \
+	static int method_name( T* p, lua_State *L ) { LuaHelpers::Push( p->expr, L ); return 1; }
+
+#define ADD_METHOD( method_name ) \
+	AddMethod( #method_name, method_name )
 
 
 #endif
diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp
index 9cd21f5f76..d5292b6567 100644
--- a/stepmania/src/MessageManager.cpp
+++ b/stepmania/src/MessageManager.cpp
@@ -202,7 +202,8 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( Broadcast )
+		ADD_METHOD( Broadcast );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index 64bead8498..d74d6ed743 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -823,7 +823,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( playanimation )
+		ADD_METHOD( playanimation );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp
index 16326dcc28..a3561dc384 100644
--- a/stepmania/src/NoteSkinManager.cpp
+++ b/stepmania/src/NoteSkinManager.cpp
@@ -296,7 +296,8 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetPath )
+		ADD_METHOD( GetPath );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/OptionIconRow.cpp b/stepmania/src/OptionIconRow.cpp
index 5816532d2a..121b254851 100644
--- a/stepmania/src/OptionIconRow.cpp
+++ b/stepmania/src/OptionIconRow.cpp
@@ -149,7 +149,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( set )
+		ADD_METHOD( set );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp
index 30228862b8..9695ba1c07 100644
--- a/stepmania/src/PaneDisplay.cpp
+++ b/stepmania/src/PaneDisplay.cpp
@@ -304,7 +304,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( SetFromGameState )
+		ADD_METHOD( SetFromGameState );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp
index 64bfa21c62..da07be4a42 100644
--- a/stepmania/src/PercentageDisplay.cpp
+++ b/stepmania/src/PercentageDisplay.cpp
@@ -199,7 +199,8 @@ public:
 
 	static void Register(lua_State *L) 
 	{
-		ADD_METHOD( LoadFromStats )
+		ADD_METHOD( LoadFromStats );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp
index 9d582c82f7..e87795a81f 100644
--- a/stepmania/src/PlayerStageStats.cpp
+++ b/stepmania/src/PlayerStageStats.cpp
@@ -529,14 +529,15 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetCaloriesBurned )
-		ADD_METHOD( GetLifeRemainingSeconds )
-		ADD_METHOD( GetSurvivalSeconds )
-		ADD_METHOD( FullCombo )
-		ADD_METHOD( MaxCombo )
-		ADD_METHOD( GetGrade )
-		ADD_METHOD( GetLessonScoreActual )
-		ADD_METHOD( GetLessonScorePossible )
+		ADD_METHOD( GetCaloriesBurned );
+		ADD_METHOD( GetLifeRemainingSeconds );
+		ADD_METHOD( GetSurvivalSeconds );
+		ADD_METHOD( FullCombo );
+		ADD_METHOD( MaxCombo );
+		ADD_METHOD( GetGrade );
+		ADD_METHOD( GetLessonScoreActual );
+		ADD_METHOD( GetLessonScorePossible );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 0ad0d9327f..d35b0e0964 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -468,8 +468,9 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetPreference )
-		ADD_METHOD( SetPreference )
+		ADD_METHOD( GetPreference );
+		ADD_METHOD( SetPreference );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 20f8fbdff3..1ea94eda69 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -1969,34 +1969,34 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetDisplayName )
-		ADD_METHOD( GetCharacter )
-		ADD_METHOD( GetWeightPounds )
-		ADD_METHOD( SetWeightPounds )
-		ADD_METHOD( GetGoalType )
-		ADD_METHOD( SetGoalType )
-		ADD_METHOD( GetGoalCalories )
-		ADD_METHOD( SetGoalCalories )
-		ADD_METHOD( GetGoalSeconds )
-		ADD_METHOD( SetGoalSeconds )
-		ADD_METHOD( GetCaloriesBurnedToday )
-		ADD_METHOD( GetSaved )
-		ADD_METHOD( GetTotalNumSongsPlayed )
-		ADD_METHOD( IsCodeUnlocked )
-		ADD_METHOD( GetSongsActual )
-		ADD_METHOD( GetCoursesActual )
-		ADD_METHOD( GetSongsPossible )
-		ADD_METHOD( GetCoursesPossible )
-		ADD_METHOD( GetSongsPercentComplete )
-		ADD_METHOD( GetCoursesPercentComplete )
-		ADD_METHOD( GetTotalStepsWithTopGrade )
-		ADD_METHOD( GetTotalTrailsWithTopGrade )
-		ADD_METHOD( GetNumTotalSongsPlayed )
-		ADD_METHOD( GetLastPlayedStepsType )
-		ADD_METHOD( GetSongsAndCoursesPercentCompleteAllDifficulties )
-		ADD_METHOD( GetDisplayTotalCaloriesBurned )
-		ADD_METHOD( GetMostPopularSong )
-		ADD_METHOD( GetMostPopularCourse )
+		ADD_METHOD( GetDisplayName );
+		ADD_METHOD( GetCharacter );
+		ADD_METHOD( GetWeightPounds );
+		ADD_METHOD( SetWeightPounds );
+		ADD_METHOD( GetGoalType );
+		ADD_METHOD( SetGoalType );
+		ADD_METHOD( GetGoalCalories );
+		ADD_METHOD( SetGoalCalories );
+		ADD_METHOD( GetGoalSeconds );
+		ADD_METHOD( SetGoalSeconds );
+		ADD_METHOD( GetCaloriesBurnedToday );
+		ADD_METHOD( GetSaved );
+		ADD_METHOD( GetTotalNumSongsPlayed );
+		ADD_METHOD( IsCodeUnlocked );
+		ADD_METHOD( GetSongsActual );
+		ADD_METHOD( GetCoursesActual );
+		ADD_METHOD( GetSongsPossible );
+		ADD_METHOD( GetCoursesPossible );
+		ADD_METHOD( GetSongsPercentComplete );
+		ADD_METHOD( GetCoursesPercentComplete );
+		ADD_METHOD( GetTotalStepsWithTopGrade );
+		ADD_METHOD( GetTotalTrailsWithTopGrade );
+		ADD_METHOD( GetNumTotalSongsPlayed );
+		ADD_METHOD( GetLastPlayedStepsType );
+		ADD_METHOD( GetSongsAndCoursesPercentCompleteAllDifficulties );
+		ADD_METHOD( GetDisplayTotalCaloriesBurned );
+		ADD_METHOD( GetMostPopularSong );
+		ADD_METHOD( GetMostPopularCourse );
 
 		Luna<T>::Register( L );
 	}
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index 2efe5009a3..15ba9e35dc 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -809,15 +809,16 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( IsPersistentProfile )
-		ADD_METHOD( GetProfile )
-		ADD_METHOD( GetMachineProfile )
-		ADD_METHOD( SaveMachineProfile )
-		ADD_METHOD( GetLocalProfile )
-		ADD_METHOD( GetLocalProfileFromIndex )
-		ADD_METHOD( GetLocalProfileIDFromIndex )
-		ADD_METHOD( GetLocalProfileIndexFromID )
-		ADD_METHOD( GetNumLocalProfiles )
+		ADD_METHOD( IsPersistentProfile );
+		ADD_METHOD( GetProfile );
+		ADD_METHOD( GetMachineProfile );
+		ADD_METHOD( SaveMachineProfile );
+		ADD_METHOD( GetLocalProfile );
+		ADD_METHOD( GetLocalProfileFromIndex );
+		ADD_METHOD( GetLocalProfileIDFromIndex );
+		ADD_METHOD( GetLocalProfileIndexFromID );
+		ADD_METHOD( GetNumLocalProfiles );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp
index d10b9e23aa..cad99d3c5e 100644
--- a/stepmania/src/RageInput.cpp
+++ b/stepmania/src/RageInput.cpp
@@ -104,7 +104,8 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetDescriptions )
+		ADD_METHOD( GetDescriptions );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 90d69d1442..4397471657 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -1264,11 +1264,12 @@ public:
 
 	static void Register( Lua *L )
 	{
-		ADD_METHOD( GetEvalStageStats )
-		ADD_METHOD( GetPersonalHighScoreIndex )
-		ADD_METHOD( GetMachineHighScoreIndex )
-		ADD_METHOD( GetPerDifficultyAward )
-		ADD_METHOD( GetPeakComboAward )
+		ADD_METHOD( GetEvalStageStats );
+		ADD_METHOD( GetPersonalHighScoreIndex );
+		ADD_METHOD( GetMachineHighScoreIndex );
+		ADD_METHOD( GetPerDifficultyAward );
+		ADD_METHOD( GetPeakComboAward );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index f52079f998..5e60211df7 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2714,7 +2714,8 @@ public:
 	static int GetNextCourseSong( T* p, lua_State *L ) { p->GetNextCourseSong()->PushSelf(L); return 1; }
 	static void Register( Lua *L )
 	{
-  		ADD_METHOD( GetNextCourseSong )
+  		ADD_METHOD( GetNextCourseSong );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 18ed99a285..f80d2c8955 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -859,9 +859,9 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( SetNewScreen )
-		ADD_METHOD( GetTopScreen )
-		ADD_METHOD( SystemMessage )
+		ADD_METHOD( SetNewScreen );
+		ADD_METHOD( GetTopScreen );
+		ADD_METHOD( SystemMessage );
 
 		Luna<T>::Register( L );
 
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 581b700999..0040654e93 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -195,7 +195,8 @@ public:
 	static int GetGoToOptions( T* p, lua_State *L ) { lua_pushboolean( L, p->GetGoToOptions() ); return 1; }
 	static void Register( Lua *L )
 	{
-  		ADD_METHOD( GetGoToOptions )
+  		ADD_METHOD( GetGoToOptions );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 2bed1289bd..3bd2f320e6 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -1818,7 +1818,8 @@ public:
 	static int GetGoToOptions( T* p, lua_State *L ) { lua_pushboolean( L, p->GetGoToOptions() ); return 1; }
 	static void Register( Lua *L )
 	{
-  		ADD_METHOD( GetGoToOptions )
+  		ADD_METHOD( GetGoToOptions );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 47874a953c..c5264f6174 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -1539,19 +1539,20 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetDisplayFullTitle )
-		ADD_METHOD( GetTranslitFullTitle )
-		ADD_METHOD( GetDisplayMainTitle )
-		ADD_METHOD( GetTranslitMainTitle )
-		ADD_METHOD( GetDisplayArtist )
-		ADD_METHOD( GetTranslitArtist )
-		ADD_METHOD( GetGenre )
-		ADD_METHOD( GetAllSteps )
-		ADD_METHOD( GetStepsByStepsType )
-		ADD_METHOD( GetSongDir )
-		ADD_METHOD( GetBannerPath )
-		ADD_METHOD( GetBackgroundPath )
-		ADD_METHOD( IsTutorial )
+		ADD_METHOD( GetDisplayFullTitle );
+		ADD_METHOD( GetTranslitFullTitle );
+		ADD_METHOD( GetDisplayMainTitle );
+		ADD_METHOD( GetTranslitMainTitle );
+		ADD_METHOD( GetDisplayArtist );
+		ADD_METHOD( GetTranslitArtist );
+		ADD_METHOD( GetGenre );
+		ADD_METHOD( GetAllSteps );
+		ADD_METHOD( GetStepsByStepsType );
+		ADD_METHOD( GetSongDir );
+		ADD_METHOD( GetBannerPath );
+		ADD_METHOD( GetBackgroundPath );
+		ADD_METHOD( IsTutorial );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 17115c0a0e..55e73f584b 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -1420,16 +1420,17 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetAllSongs )
-		ADD_METHOD( GetAllCourses )
-		ADD_METHOD( FindSong )
-		ADD_METHOD( FindCourse )
-		ADD_METHOD( GetRandomSong )
-		ADD_METHOD( GetRandomCourse )
-		ADD_METHOD( GetNumSongs )
-		ADD_METHOD( GetNumSongGroups )
-		ADD_METHOD( GetNumCourses )
-		ADD_METHOD( GetNumCourseGroups )
+		ADD_METHOD( GetAllSongs );
+		ADD_METHOD( GetAllCourses );
+		ADD_METHOD( FindSong );
+		ADD_METHOD( FindCourse );
+		ADD_METHOD( GetRandomSong );
+		ADD_METHOD( GetRandomCourse );
+		ADD_METHOD( GetNumSongs );
+		ADD_METHOD( GetNumSongGroups );
+		ADD_METHOD( GetNumCourses );
+		ADD_METHOD( GetNumCourseGroups );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index 11fe71ff60..562601afd7 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -972,17 +972,18 @@ public:
 	static int rate( T* p, lua_State *L )				{ p->SetPlaybackRate(FArg(1)); return 0; }
 
 	static void Register(lua_State *L) {
-		ADD_METHOD( Load )
-		ADD_METHOD( LoadBanner )
-		ADD_METHOD( LoadBackground )
-		ADD_METHOD( customtexturerect )
-		ADD_METHOD( texcoordvelocity )
-		ADD_METHOD( scaletoclipped )
-		ADD_METHOD( stretchtexcoords )
-		ADD_METHOD( setstate )
-		ADD_METHOD( position )
-		ADD_METHOD( loop )
-		ADD_METHOD( rate )
+		ADD_METHOD( Load );
+		ADD_METHOD( LoadBanner );
+		ADD_METHOD( LoadBackground );
+		ADD_METHOD( customtexturerect );
+		ADD_METHOD( texcoordvelocity );
+		ADD_METHOD( scaletoclipped );
+		ADD_METHOD( stretchtexcoords );
+		ADD_METHOD( setstate );
+		ADD_METHOD( position );
+		ADD_METHOD( loop );
+		ADD_METHOD( rate );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index 5f1235e9db..830d05f7a3 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -132,10 +132,11 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetPlayerStageStats )
-		ADD_METHOD( GetGameplaySeconds )
-		ADD_METHOD( OnePassed )
-		ADD_METHOD( AllFailed )
+		ADD_METHOD( GetPlayerStageStats );
+		ADD_METHOD( GetGameplaySeconds );
+		ADD_METHOD( OnePassed );
+		ADD_METHOD( AllFailed );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp
index 03cb3cfc4e..ce902b36a3 100644
--- a/stepmania/src/StatsManager.cpp
+++ b/stepmania/src/StatsManager.cpp
@@ -244,13 +244,13 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetCurStageStats )
-		ADD_METHOD( GetAccumStageStats )
-		ADD_METHOD( Reset )
-		ADD_METHOD( GetFinalGrade )
-		ADD_METHOD( GetStagesPlayed )
-		ADD_METHOD( GetBestGrade )
-		ADD_METHOD( GetWorstGrade )
+		ADD_METHOD( GetCurStageStats );
+		ADD_METHOD( GetAccumStageStats );
+		ADD_METHOD( Reset );
+		ADD_METHOD( GetFinalGrade );
+		ADD_METHOD( GetStagesPlayed );
+		ADD_METHOD( GetBestGrade );
+		ADD_METHOD( GetWorstGrade );
 
 		Luna<T>::Register( L );
 
diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp
index 1215f662ee..2f5541159e 100644
--- a/stepmania/src/Steps.cpp
+++ b/stepmania/src/Steps.cpp
@@ -373,10 +373,11 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetStepsType )
-		ADD_METHOD( GetDifficulty )
-		ADD_METHOD( GetDescription )
-		ADD_METHOD( GetMeter )
+		ADD_METHOD( GetStepsType );
+		ADD_METHOD( GetDifficulty );
+		ADD_METHOD( GetDescription );
+		ADD_METHOD( GetMeter );
+
 		Luna<T>::Register( L );
 	}
 };
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 4883ba0365..75a1851e8c 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -882,10 +882,10 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetMetric )
-		ADD_METHOD( GetPathG )
-		ADD_METHOD( GetPathB )
-		ADD_METHOD( GetPathS )
+		ADD_METHOD( GetMetric );
+		ADD_METHOD( GetPathG );
+		ADD_METHOD( GetPathB );
+		ADD_METHOD( GetPathS );
 
 		Luna<T>::Register( L );
 
diff --git a/stepmania/src/Trail.cpp b/stepmania/src/Trail.cpp
index 75892325c5..3d89ec20e2 100644
--- a/stepmania/src/Trail.cpp
+++ b/stepmania/src/Trail.cpp
@@ -196,8 +196,8 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( GetCourseDifficulty )
-		ADD_METHOD( GetStepsType )
+		ADD_METHOD( GetCourseDifficulty );
+		ADD_METHOD( GetStepsType );
 
 		Luna<T>::Register( L );
 	}
diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp
index 944f502d50..786596c0af 100644
--- a/stepmania/src/UnlockManager.cpp
+++ b/stepmania/src/UnlockManager.cpp
@@ -535,12 +535,13 @@ public:
 
 	static void Register(lua_State *L)
 	{
-		ADD_METHOD( FindCode )
-		ADD_METHOD( UnlockCode )
-		ADD_METHOD( PreferUnlockCode )
-		ADD_METHOD( GetNumUnlocks )
-		ADD_METHOD( GetSongsUnlockedByCode )
-		ADD_METHOD( GetStepsUnlockedByCode )
+		ADD_METHOD( FindCode );
+		ADD_METHOD( UnlockCode );
+		ADD_METHOD( PreferUnlockCode );
+		ADD_METHOD( GetNumUnlocks );
+		ADD_METHOD( GetSongsUnlockedByCode );
+		ADD_METHOD( GetStepsUnlockedByCode );
+
 		Luna<T>::Register( L );
 
 		// Add global singleton if constructed already.  If it's not constructed yet,