Jan-Willem Gmelig Meyling if it's not too much work, present your approach in the PR in a separate commit and we'll discuss from there.

If it's a big change, ping me and I'll take a closer look.

Thanks!