More mostly-comment improvements.