That sounds good to me.

Let's make the new API `private[sbt]` if we are not 100% that it's final iteration.