Some DocFormatter improvements.