Simplify some loop constructs, per stassats gripe.