Continued converting Scala files to Java.