Remove some for loops

Evades a bug in Proguard for those so inclined