Cherry-pick forgotten commit that fixes loop control variable

@BrettASwift, we forgot that this commit went away when we excluded the *multiple uv* commits.  Now that we added those back in, we need it again.  :smile: 

Would you mind reviewing?