More work on the doc comments.