Address code-review feedback.