Cosmetic changes to improve rdoc output.