Tweaks per PR comments.