Re-re done ScalaBuffBuild.scala changes.