i'm currently working on https://github.com/pantsbuild/pants/issues/4416 , and possibly something to unblock https://github.com/pantsbuild/pants/issues/4401 at the same time.