Converted more Scala files to Java.