Scala style fixes.