In the mean time, I’ve updated https://github.com/pantsbuild/pants/pull/5908 and now I disappear for ~the evening 🙂