diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp
index 939f66d071..c4dbf34952 100644
--- a/stepmania/src/PercentageDisplay.cpp
+++ b/stepmania/src/PercentageDisplay.cpp
@@ -72,7 +72,7 @@ void PercentageDisplay::Load( const PlayerState *pPlayerState, const PlayerStage
 	m_iDancePointsDigits = THEME->GetMetricI( sMetricsGroup, "DancePointsDigits" );
 	m_bUseRemainder = THEME->GetMetricB( sMetricsGroup, "PercentUseRemainder" );
 	m_bApplyScoreDisplayOptions = THEME->GetMetricB( sMetricsGroup, "ApplyScoreDisplayOptions" );
-	m_Format.SetFromExpression( THEME->GetMetric(sMetricsGroup, "Format") );
+	m_Format = THEME->GetMetricR( sMetricsGroup, "Format" );
 	
 	if( m_Format.IsNil() )
 	{
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index b27996fb57..0509265296 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -151,8 +151,7 @@ void Player::Init(
 		//
 		// Init judgment positions
 		//
-		LuaReference expr;
-		expr.SetFromExpression( THEME->GetMetric(sType,"JudgmentTransformCommandFunction") );
+		LuaReference expr = THEME->GetMetricR( sType,"JudgmentTransformCommandFunction" );
 
 		bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==ONE_PLAYER_TWO_SIDES;
 		Actor temp;