Nits, small improvement for Scala.