Experimental modifications for a correct javadoc generation.