Refs ZEN-5557. Incorporate code review feedback.