core refactoring
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.

Change-Id: I7877030a8ac19623b9847cb761579c77f4d8a157
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>