Address final PR comments.