Small fixes brought in from official translator.

Iterate arrays correctly.
Remove some superfluous tests.