Ugh. Ok. I’m pretty sure the answer is for now even more newtypes and wrapping. And possibly https://github.com/pantsbuild/pants/issues/8343