... so yea. i think 2 is probably pretty straightforward. depending whether https://github.com/pantsbuild/pants/pull/6013 or your change lands first, one of us would need to do a little bit of rebasing, but it's small enough that i don't think it would be that bad.