Updated for PR comments.