Matěj Novotný I'd be happy to; I hope I've succeeded: https://github.com/weld/core/pull/1999

A pretty auspicious PR number to boot.

I made the PR against the 3.1 branch. It apparently doesn't immediately merge against master; I'll happily work that out if targeting master is preferred.

Thanks for your assistance with this issue. I've since revised those two fanciful priorities in our application without any impact so I'm not dependent on this fix, but live in hope that it saves some other poor sap a few hours on a Friday some time in the future