And https://github.com/pantsbuild/pants/pull/6661 is PR #2 up to you how much clean-up goes in before it lands; it has some tests