Addressing more PR comments.