Even more comment improvements.