Incorporate review feedback.  Fix #8468.