I’ve addressed what comments were left on https://github.com/pantsbuild/pants/pull/4134 and wrapped it up into a new PR https://github.com/pantsbuild/pants/pull/4514 with only one changeset