Am happy to add a comment, but the TODO is premature. I'd prefer the discussion was raised on the mailing list or an issue was raised as I agree it needs further discussion. But, as your proposal has an equal number of quirks to the current pathway, I don't feel we should change this as part of this PR.