Wow, great ticket. Clear, thoughtful, and you've already conceptually solved the problem. I'll make sure this gets fixed in 1.11.6
Yeah, but I didn't actually fix it and send a pull request! So it could have been better.
You don't need to apologize for anything. I'd nominate you for an award just for digging into the problem. As yet that is a rarity in the Wagn community, and we need many more like you.
Thanks.
Addressed in this commit, currently being reviewed in this pull request