Let var hygiene

Just rebasing #7745 for landing.