Complete variables refactoring.