> This is not a simple change, and I'd rather do it after the free form refactoring as it expects a similar structure.
That's ok, I just wanted to keep track of it. I'm pretty sure it's not the first time I'm surprised by the current behaviour