This is precisely why this refactor is worth it.