Some general cleanup of comments.