Updated ForStmt parsing and generation