This looks like a good opportunity to use a parameter object going forward.