Second part of the java documentation extension / cleanup.