I think I originally had those methods split up as you suggest, before I opted for the `ModelHelper`. I did so on the rationale that we had established something of a precedent of not including 'helper' methods inside `*Entity` classes. I have no reason other than precedent for not so doing, and I agree that they fit more reasonably therein. I'll move them therein.