Lots of Java-related additions.