By the way, I’m not at all attached to how things are being done in https://github.com/pantsbuild/pants/pull/5801 - it was very quick to put together and I’m happy to completely rewrite it if you have a nicer thought 🙂