I think we can ditch these variables and have the code use the functions directly. We can make that change as part of this, or after. Just mentioning.