Update scala/sbt versions and minor cleanup.