It's an interim step on a larger refactoring of this class. But good point, thanks.