Address latest round of feedback.