Doc cleanup for rdoc 4.1