Hi! I’d like a set of eyes in this PR, particularly to validate if the approach looks sane, or there’s a case that I’m missing: https://github.com/pantsbuild/pants/pull/7341 The first commit (~10 lines), particularly. If anyone is free, could they take a look?