Similar to previous patch: eliminate one variable by using "break".
This also simplifies the code since we can remove one level of indent.