More changes per code review feedback.