I think that is a good suggestion but as I see it it is out of scope for this refactoring.

If interested please create an issue for this so we remember to look at it later on.