diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua
index ecc4243131..e56040c724 100644
--- a/stepmania/Themes/default/Scripts/Branches.lua
+++ b/stepmania/Themes/default/Scripts/Branches.lua
@@ -183,7 +183,7 @@ local function ShowScreenInstructions()
 		return true
 	end
 
-	for _,pn in ipairs(PlayerNumber) do
+	for pn in ivalues(PlayerNumber) do
 		if Difficulty:Compare( GAMESTATE:GetPreferredDifficulty(pn), "Difficulty_Easy" ) <= 0 then
 			return true
 		end
diff --git a/stepmania/Themes/default/Scripts/StageMods.lua b/stepmania/Themes/default/Scripts/StageMods.lua
index 6e7cb0ebc9..17b8f9eed4 100644
--- a/stepmania/Themes/default/Scripts/StageMods.lua
+++ b/stepmania/Themes/default/Scripts/StageMods.lua
@@ -21,7 +21,7 @@ function ScreenSelectMusic:setupmusicstagemods()
 	GAMESTATE:SetCurrentSong( song )
 	GAMESTATE:SetPreferredSong( song )
 
-	for _, pn in ipairs(GAMESTATE:GetHumanPlayers()) do
+	for pn in ivalues(GAMESTATE:GetHumanPlayers()) do
 		GAMESTATE:SetCurrentSteps( pn, steps )
 		GAMESTATE:GetPlayerState(pn):SetPlayerOptions( "ModsLevel_Stage", po )
 		GAMESTATE:SetPreferredDifficulty( pn, difficulty )
@@ -42,7 +42,7 @@ function ScreenSelectMusic:setupcoursestagemods()
 		local so = "failimmediate"
 		local Reverse = PlayerNumber:Reverse()
 
-		for _, pn in ipairs(GAMESTATE:GetHumanPlayers()) do
+		for pn in ivalues(GAMESTATE:GetHumanPlayers()) do
 			GAMESTATE:GetPlayerState(pn):SetPlayerOptions( "ModsLevel_Stage", po )
 			MESSAGEMAN:Broadcast( "PlayerOptionsChangedP" .. (Reverse[pn]+1) )
 		end