OK, that was a journey. I think I have this sussed with inspiration from some pex code and a bit of slogging. I'm happy to spin up a release post-fix and a PR for the fix should be forthcoming shortly.