Changes suggested in code review.