More recursion -> loop changes.