I have https://github.com/pantsbuild/pants/issues/5307 in progress which will factor up this complexity into a base class for these two tasks, but that doesn't really help I'd guess