tweaks based on new output from nag-doc