OK. Fair enough, thanks for the feedback. That also therefore settles, in which class the method best sits :-).

I'll refactor, cancel the PR and issue a new one.