LP#1292214: Improve docgen output