Replaced foreach loop (WTF mlucy) with a for loop.
Replaced arg_it with arg_iter, silly.
Merge branch 'next' into sam_gcc44_fixes