Few style/whitespace/comment issues from r86169