Re #8033. Update comments.