maybe, but this PR is complex enough i think^^
But it could be done in a separate PR yes, maybe could you create a ticket (with a trivial priority?)