Changes per code review feedback.