Also, if anyone has a second to look at https://github.com/pantsbuild/pants/pull/17985