Refs #8131 Minor feedback changes.