More work on comments.