More work to make "javadoc" command more robust.