(2) is probably a bit better long term, because it is more general. but unfortunately it would definitely collide with what i'm doing in https://github.com/pantsbuild/pants/pull/6013 and https://github.com/pantsbuild/pants/pull/6059