Update for-let handling in