diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 4a35b23cfb..3d428a2a48 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -1215,9 +1215,9 @@ void Actor::SetParent( Actor *pParent )
 	LUA->Release( L );
 }
 
-void Actor::HandleMessage( const RString& sMessage )
+void Actor::HandleMessage( const Message &msg )
 {
-	PlayCommand( sMessage );
+	PlayCommand( msg.GetName() );
 }
 
 Actor::TweenInfo::TweenInfo()
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index cfe6d539a0..8351247ea3 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -365,7 +365,7 @@ public:
 	//
 	// Messages
 	//
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 
 	//
 	// Animation
diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp
index cd842b5f47..404df58c8d 100644
--- a/stepmania/src/HoldJudgment.cpp
+++ b/stepmania/src/HoldJudgment.cpp
@@ -77,13 +77,13 @@ void HoldJudgment::LoadFromMultiPlayer( MultiPlayer mp )
 	this->SubscribeToMessage( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) );
 }
 
-void HoldJudgment::HandleMessage( const RString &sMessage )
+void HoldJudgment::HandleMessage( const Message &msg )
 {
 	ASSERT( m_mpToTrack != MultiPlayer_Invalid );
-	if( sMessage == MessageToString( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) ) )
+	if( msg == enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) )
 		SetHoldJudgment( STATSMAN->m_CurStageStats.m_multiPlayer[m_mpToTrack].hnsLast );
 
-	ActorFrame::HandleMessage( sMessage );
+	ActorFrame::HandleMessage( msg );
 }
 
 // lua start
diff --git a/stepmania/src/HoldJudgment.h b/stepmania/src/HoldJudgment.h
index 220bb0db00..1179f66afd 100644
--- a/stepmania/src/HoldJudgment.h
+++ b/stepmania/src/HoldJudgment.h
@@ -16,7 +16,7 @@ public:
 
 	void SetHoldJudgment( HoldNoteScore hns );
 	void LoadFromMultiPlayer( MultiPlayer mp );
-	void HandleMessage( const RString &sMessage );
+	void HandleMessage( const Message &msg );
 
 	//
 	// Lua
diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp
index 0503b1f34f..0db36631f3 100644
--- a/stepmania/src/Judgment.cpp
+++ b/stepmania/src/Judgment.cpp
@@ -105,12 +105,12 @@ void Judgment::LoadFromMultiPlayer( MultiPlayer mp )
 	this->SubscribeToMessage( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) );
 }
 
-void Judgment::HandleMessage( const RString &sMessage )
+void Judgment::HandleMessage( const Message &msg )
 {
-	if( m_mpToTrack != MultiPlayer_Invalid  &&  sMessage == MessageToString( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) ) )
+	if( m_mpToTrack != MultiPlayer_Invalid  &&  msg == enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) )
 		SetJudgment( STATSMAN->m_CurStageStats.m_multiPlayer[m_mpToTrack].tnsLast, false );	// FIXME: save and pass early bool?
 
-	ActorFrame::HandleMessage( sMessage );
+	ActorFrame::HandleMessage( msg );
 }
 
 
diff --git a/stepmania/src/Judgment.h b/stepmania/src/Judgment.h
index ab51522a67..e5f3ae017c 100644
--- a/stepmania/src/Judgment.h
+++ b/stepmania/src/Judgment.h
@@ -19,7 +19,7 @@ public:
 	void LoadFromNode( const XNode* pNode );
 	void Reset();
 	void SetJudgment( TapNoteScore score, bool bEarly );
-	void HandleMessage( const RString &sMessage );
+	void HandleMessage( const Message &msg );
 
 	//
 	// Lua
diff --git a/stepmania/src/MusicSortDisplay.cpp b/stepmania/src/MusicSortDisplay.cpp
index d7a06c308d..791e6e7c45 100644
--- a/stepmania/src/MusicSortDisplay.cpp
+++ b/stepmania/src/MusicSortDisplay.cpp
@@ -22,12 +22,12 @@ void MusicSortDisplay::Set( SortOrder so )
 		Load( THEME->GetPathG("MusicSortDisplay",SortOrderToString(so)) );
 }
 
-void MusicSortDisplay::HandleMessage( const RString& sMessage )
+void MusicSortDisplay::HandleMessage( const Message &msg )
 {
-	if( sMessage == "SortOrderChanged" )
+	if( msg == "SortOrderChanged" )
 		Set( GAMESTATE->m_SortOrder );
 
-	Sprite::HandleMessage( sMessage );
+	Sprite::HandleMessage( msg );
 }
 
 /*
diff --git a/stepmania/src/MusicSortDisplay.h b/stepmania/src/MusicSortDisplay.h
index 864b35ebbe..4427fd93b6 100644
--- a/stepmania/src/MusicSortDisplay.h
+++ b/stepmania/src/MusicSortDisplay.h
@@ -12,7 +12,7 @@ public:
 	MusicSortDisplay();
 	virtual MusicSortDisplay *Copy() const;
 	void Set( SortOrder so );
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 
 protected:
 
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index edf9648007..052de70b25 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -301,17 +301,17 @@ void MusicWheelItem::RefreshGrades()
 	}
 }
 
-void MusicWheelItem::HandleMessage( const RString& sMessage )
+void MusicWheelItem::HandleMessage( const Message &msg )
 {
-	if( sMessage == MessageToString(Message_CurrentStepsP1Changed) ||
-		sMessage == MessageToString(Message_CurrentStepsP2Changed) ||
-		sMessage == MessageToString(Message_CurrentTrailP1Changed) ||
-		sMessage == MessageToString(Message_CurrentTrailP2Changed) ||
-		sMessage == MessageToString(Message_PreferredDifficultyP1Changed) ||
-		sMessage == MessageToString(Message_PreferredDifficultyP2Changed) )
+	if( msg == Message_CurrentStepsP1Changed ||
+		msg == Message_CurrentStepsP2Changed ||
+		msg == Message_CurrentTrailP1Changed ||
+		msg == Message_CurrentTrailP2Changed ||
+		msg == Message_PreferredDifficultyP1Changed ||
+		msg == Message_PreferredDifficultyP2Changed )
 		RefreshGrades();
 
-	Actor::HandleMessage( sMessage );
+	Actor::HandleMessage( msg );
 }
 
 /*
diff --git a/stepmania/src/MusicWheelItem.h b/stepmania/src/MusicWheelItem.h
index 0dd72d5a96..dd6627a651 100644
--- a/stepmania/src/MusicWheelItem.h
+++ b/stepmania/src/MusicWheelItem.h
@@ -26,7 +26,7 @@ public:
 	virtual MusicWheelItem *Copy() const { return new MusicWheelItem(*this); }
 
 	virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 	void RefreshGrades();
 
 	const WheelItemData *data;
diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 78cef2cfaa..a731972c1a 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -874,7 +874,7 @@ void OptionRow::Reload()
 	//}
 }
 
-void OptionRow::HandleMessage( const RString& sMessage )
+void OptionRow::HandleMessage( const Message &msg )
 {
 	Reload();
 }
diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h
index 5fd9b6d7cf..2d5ce66951 100644
--- a/stepmania/src/OptionRow.h
+++ b/stepmania/src/OptionRow.h
@@ -124,7 +124,7 @@ public:
 	//
 	// Messages
 	//
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 
 protected:
 	RString GetRowTitle() const;
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 522877bae3..4cdb15ceca 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2367,13 +2367,13 @@ void ScreenEdit::ScrollTo( float fDestinationBeat )
 	m_soundChangeLine.Play();
 }
 
-void ScreenEdit::HandleMessage( const RString &sMessage )
+void ScreenEdit::HandleMessage( const Message &msg )
 {
-	if( sMessage == MessageToString(Message_SongModified) )
+	if( msg == Message_SongModified )
 	{
 		SetDirty( true );
 	}
-	Screen::HandleMessage( sMessage );
+	Screen::HandleMessage( msg );
 }
 
 static LocalizedString SAVE_SUCCESSFUL				( "ScreenEdit", "Save successful." );
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 3f83800c14..55f9d8d2b4 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -179,7 +179,7 @@ public:
 	void InputRecord( const InputEventPlus &input, EditButton EditB );
 	void InputRecordPaused( const InputEventPlus &input, EditButton EditB );
 	void InputPlay( const InputEventPlus &input, EditButton EditB );
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 	void SetDirty( bool bDirty )	{ m_bDirty = bDirty; }
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index b7198382b8..cfb0d7f95c 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -468,14 +468,14 @@ void ScreenMapControllers::Refresh()
 	m_LineScroller.SetDestinationItem( (float) m_iCurButton );
 }
 
-void ScreenMapControllers::HandleMessage( const RString& sMessage )
+void ScreenMapControllers::HandleMessage( const Message &msg )
 {
-	if( sMessage == MessageToString(Message_AutoJoyMappingApplied) )
+	if( msg == Message_AutoJoyMappingApplied )
 	{
 		Refresh();
 	}
 
-	ScreenWithMenuElements::HandleMessage( sMessage );
+	ScreenWithMenuElements::HandleMessage( msg );
 }
 
 
diff --git a/stepmania/src/ScreenMapControllers.h b/stepmania/src/ScreenMapControllers.h
index 7e8a64dea3..485e58d700 100644
--- a/stepmania/src/ScreenMapControllers.h
+++ b/stepmania/src/ScreenMapControllers.h
@@ -22,7 +22,7 @@ public:
 	virtual void TweenOffScreen();
 
 private:
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 
 	Actor *GetActorWithFocus();
 	void BeforeChangeFocus();
diff --git a/stepmania/src/ScreenOptionsEditCourse.cpp b/stepmania/src/ScreenOptionsEditCourse.cpp
index f4ff5fb55d..4dd6b6d4de 100644
--- a/stepmania/src/ScreenOptionsEditCourse.cpp
+++ b/stepmania/src/ScreenOptionsEditCourse.cpp
@@ -335,9 +335,9 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
 
 }
 
-void ScreenOptionsEditCourse::HandleMessage( const RString& sMessage )
+void ScreenOptionsEditCourse::HandleMessage( const Message &msg )
 {
-	if( sMessage == "EditCourseDifficultyChanged" )
+	if( msg == "EditCourseDifficultyChanged" )
 	{
 		const vector<PlayerNumber> vpns( 1, GAMESTATE->m_MasterPlayerNumber );
 		OptionRow &row = *m_pRows[EditCourseRow_Meter];
@@ -345,7 +345,7 @@ void ScreenOptionsEditCourse::HandleMessage( const RString& sMessage )
 		ImportOptions( EditCourseRow_Meter, vpns );
 		row.AfterImportOptions( GAMESTATE->m_MasterPlayerNumber );
 	}
-	ScreenOptionsEditCourseSubMenu::HandleMessage( sMessage );
+	ScreenOptionsEditCourseSubMenu::HandleMessage( msg );
 }
 
 int ScreenOptionsEditCourse::GetCourseEntryIndexWithFocus() const
diff --git a/stepmania/src/ScreenOptionsEditCourse.h b/stepmania/src/ScreenOptionsEditCourse.h
index 51c2a03697..771ac490ad 100644
--- a/stepmania/src/ScreenOptionsEditCourse.h
+++ b/stepmania/src/ScreenOptionsEditCourse.h
@@ -19,7 +19,7 @@ protected:
 	virtual void AfterChangeRow( PlayerNumber pn );
 	virtual void AfterChangeValueInRow( int iRow, PlayerNumber pn );
 	virtual void ProcessMenuStart( const InputEventPlus &input );
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 
 	int GetCourseEntryIndexWithFocus() const;
 
diff --git a/stepmania/src/ScreenOptionsMemoryCard.cpp b/stepmania/src/ScreenOptionsMemoryCard.cpp
index cc0b8fe3fe..2aa9fce1f2 100644
--- a/stepmania/src/ScreenOptionsMemoryCard.cpp
+++ b/stepmania/src/ScreenOptionsMemoryCard.cpp
@@ -129,9 +129,9 @@ void ScreenOptionsMemoryCard::AfterChangeRow( PlayerNumber pn )
 	}
 }
 
-void ScreenOptionsMemoryCard::HandleMessage( const RString& sMessage )
+void ScreenOptionsMemoryCard::HandleMessage( const Message &msg )
 {
-	if( sMessage == MessageToString(Message_StorageDevicesChanged) )
+	if( msg == Message_StorageDevicesChanged )
 	{
 		if( !m_Out.IsTransitioning() )
 		{
diff --git a/stepmania/src/ScreenOptionsMemoryCard.h b/stepmania/src/ScreenOptionsMemoryCard.h
index 816cf5dff6..18e2fa74ea 100644
--- a/stepmania/src/ScreenOptionsMemoryCard.h
+++ b/stepmania/src/ScreenOptionsMemoryCard.h
@@ -21,7 +21,7 @@ private:
 	void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
 	void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
 
-	void HandleMessage( const RString& sMessage );
+	void HandleMessage( const Message &msg );
 
 	void ProcessMenuStart( const InputEventPlus &input );
 
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index b75c176433..13ae2021dc 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -249,11 +249,11 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 	Screen::HandleScreenMessage( SM );
 }
 
-void ScreenSelect::HandleMessage( const RString &sMessage )
+void ScreenSelect::HandleMessage( const Message &msg )
 {
 	this->UpdateSelectableChoices();
 
-	Screen::HandleMessage( sMessage );
+	Screen::HandleMessage( msg );
 }
 
 void ScreenSelect::MenuBack( const InputEventPlus &input )
diff --git a/stepmania/src/ScreenSelect.h b/stepmania/src/ScreenSelect.h
index 920c4e0473..cce77cbf7f 100644
--- a/stepmania/src/ScreenSelect.h
+++ b/stepmania/src/ScreenSelect.h
@@ -19,7 +19,7 @@ public:
 	virtual void DrawPrimitives();
 	virtual void Input( const InputEventPlus &input );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
-	virtual void HandleMessage( const RString &sMessage );
+	virtual void HandleMessage( const Message &msg );
 	
 	virtual void MenuBack( const InputEventPlus &input );
 
diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp
index f5e59dbc73..c460c63ab2 100644
--- a/stepmania/src/ScreenSystemLayer.cpp
+++ b/stepmania/src/ScreenSystemLayer.cpp
@@ -175,20 +175,20 @@ RString ScreenSystemLayer::GetCreditsMessage( PlayerNumber pn ) const
 	}
 }
 
-void ScreenSystemLayer::HandleMessage( const RString &sMessage )
+void ScreenSystemLayer::HandleMessage( const Message &msg )
 {
 	bool bJoinedMessage = false;
 	FOREACH_PlayerNumber( pn )
-		if( MessageToString(enum_add2(Message_SideJoinedP1, pn)) == sMessage )
+		if( msg == enum_add2(Message_SideJoinedP1, pn) )
 			bJoinedMessage = true;
 
-	if( sMessage == "RefreshCreditText" || sMessage == "CoinInserted" || bJoinedMessage )
+	if( msg == "RefreshCreditText" || msg == "CoinInserted" || bJoinedMessage )
 	{
 		// update joined
 		FOREACH_PlayerNumber( pn )
 			m_textCredits[pn].SetText( GetCreditsMessage(pn) );
 	}
-	else if( sMessage == "SystemMessage" )
+	else if( msg == "SystemMessage" )
 	{
 		m_sprMessageFrame->SetHidden( false );
 		m_sprMessageFrame->PlayCommand( "On" );
@@ -199,7 +199,7 @@ void ScreenSystemLayer::HandleMessage( const RString &sMessage )
 		m_textMessage.PlayCommand( "On" );
 		m_textMessage.PlayCommand( "Off" );
 	}
-	else if( sMessage == "SystemMessageNoAnimate" )
+	else if( msg == "SystemMessageNoAnimate" )
 	{
 		m_sprMessageFrame->SetHidden( false );
 		m_sprMessageFrame->PlayCommand( "On" );
@@ -212,13 +212,13 @@ void ScreenSystemLayer::HandleMessage( const RString &sMessage )
 		m_textMessage.FinishTweening();
 		m_textMessage.PlayCommand( "Off" );
 	}
-	else if( sMessage == "HideSystemMessage" )
+	else if( msg == "HideSystemMessage" )
 	{
 		m_sprMessageFrame->SetHidden( true );
 
 		m_textMessage.SetHidden( true );
 	}
-	Screen::HandleMessage( sMessage );
+	Screen::HandleMessage( msg );
 }
 
 void ScreenSystemLayer::Update( float fDeltaTime )
diff --git a/stepmania/src/ScreenSystemLayer.h b/stepmania/src/ScreenSystemLayer.h
index 4bcb93398e..c7a8b18983 100644
--- a/stepmania/src/ScreenSystemLayer.h
+++ b/stepmania/src/ScreenSystemLayer.h
@@ -14,7 +14,7 @@ class ScreenSystemLayer : public Screen
 {
 public:
 	virtual void Init();
-	void HandleMessage( const RString &sCommandName );
+	void HandleMessage( const Message &msg );
 
 	void ReloadCreditsText();
 	void Update( float fDeltaTime );
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index 7c6440ae70..d97481eaef 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -89,9 +89,9 @@ void ScreenTitleMenu::Input( const InputEventPlus &input )
 	ScreenSelectMaster::Input( input );
 }
 
-void ScreenTitleMenu::HandleMessage( const RString& sMessage )
+void ScreenTitleMenu::HandleMessage( const Message &msg )
 {
-	if( sMessage == PREFSMAN->m_CoinMode.GetName()+"Changed" )
+	if( msg == PREFSMAN->m_CoinMode.GetName()+"Changed" )
 	{
 		/* If the CoinMode was changed, we need to reload this screen
 		 * so that the right m_aGameCommands will show */
diff --git a/stepmania/src/ScreenTitleMenu.h b/stepmania/src/ScreenTitleMenu.h
index 1cb74b6e7d..355e65ce3f 100644
--- a/stepmania/src/ScreenTitleMenu.h
+++ b/stepmania/src/ScreenTitleMenu.h
@@ -14,7 +14,7 @@ public:
 
 	virtual void Input( const InputEventPlus &input );
 
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 
 protected:
 	RageSound			m_soundSelectPressed;
diff --git a/stepmania/src/ScreenUnlockBrowse.cpp b/stepmania/src/ScreenUnlockBrowse.cpp
index 029dc3e552..736945062e 100644
--- a/stepmania/src/ScreenUnlockBrowse.cpp
+++ b/stepmania/src/ScreenUnlockBrowse.cpp
@@ -43,7 +43,7 @@ void ScreenUnlockBrowse::BeginScreen()
 {
 	ScreenSelectMaster::BeginScreen();
 
-	HandleMessage( MessageToString(Message_MenuSelectionChanged) );
+	HandleMessage( Message(MessageToString(Message_MenuSelectionChanged)) );
 }
 
 void ScreenUnlockBrowse::MenuStart( const InputEventPlus &input )
@@ -64,9 +64,9 @@ void ScreenUnlockBrowse::TweenOffScreen()
 	ScreenSelectMaster::TweenOffScreen();
 }
 
-void ScreenUnlockBrowse::HandleMessage( const RString& sMessage )
+void ScreenUnlockBrowse::HandleMessage( const Message &msg )
 {
-	if( sMessage == MessageToString(Message_MenuSelectionChanged) )
+	if( msg == Message_MenuSelectionChanged )
 	{
 		int iSelection = this->GetSelectionIndex(PLAYER_1);
 		const UnlockEntry &ue = UNLOCKMAN->m_UnlockEntries[ iSelection ];
@@ -76,7 +76,7 @@ void ScreenUnlockBrowse::HandleMessage( const RString& sMessage )
 			m_banner.LoadBannerFromUnlockEntry( &ue );
 	}
 
-	ScreenSelectMaster::HandleMessage( sMessage );
+	ScreenSelectMaster::HandleMessage( msg );
 }
 
 /*
diff --git a/stepmania/src/ScreenUnlockBrowse.h b/stepmania/src/ScreenUnlockBrowse.h
index 3dee992c80..86b5a8dbb2 100644
--- a/stepmania/src/ScreenUnlockBrowse.h
+++ b/stepmania/src/ScreenUnlockBrowse.h
@@ -13,7 +13,7 @@ public:
 
 	virtual void TweenOnScreen();
 	virtual void TweenOffScreen();
-	virtual void HandleMessage( const RString& sMessage );
+	virtual void HandleMessage( const Message &msg );
 
 protected:
 	FadingBanner m_banner;