Addressing the remaining code review comments.