Use vals to make the refactoring a little easier.