Reverted pushing var assignments into for-while.