*9016* Addressing issues from code review.