More cleanup for comments.