CodeGen: switch to a range based for loop