I tripped over https://github.com/pantsbuild/pants/issues/15840 today. I'll probably take a stab at it, but since there isn't an unambiguous "fix" further comments would be welcome.