More Scalafication.