More rewriting of the doc generators