Fix @darobin's comments except for <dfn> structure and whitespace.