That was my original thought, but it seemed like too big of a refactor. I'll take another look.