Shivaram's code review comment.