[Parser] Added for-loop re-ordering (needs inner-loop now)