would appreciate some eyes on https://github.com/pantsbuild/pants/pull/4343 , https://github.com/pantsbuild/pants/pull/4346, and https://github.com/pantsbuild/pants/pull/4348