More work on refactoring the javadoc command.