I'm not sure? I'd prefer some refactoring to make this more obvious
(and the split between the two functions doesn't help ...).
If you're sure it's all covered then ignore this comment, I can do
the refactoring as followup. It just wasn't obvious to me.
Ah, I think I misread your original comment slightly, thinking what you
suggested was part of your planned refactoring and not something the patch
could still do.
I'll split everything into maybe three to four patches and include the pre
transform for a v3.
--
Regards
Robin