Refs ZEN-5557. Code review feedback.