@fancy-queen-20734 : hm, so i know i said that area of the code wouldn't be changing, but: https://github.com/pantsbuild/pants/pull/4381 should actually help with https://github.com/pantsbuild/pants/pull/4371 ... if you have a chance today, would appreciate a review. it just shuffles things... no semantic changes.