Removing more usages of Values()