Another try at generating proper Javadocs