Update "declare variables as late as possible"