Re-re-re done ScalaBuffBuild.scala changes (accidentally used auto-merge).