It's likely, but I don't want to abstract preemptively (more than I already do). I think we can leave it for now and pull it out later when we notice duplication.