More robust parsing.
Initial implementation for for loops.