Scala-fie some more things.