Full variable handling update.