another big tidyup for rdoc