Cleanup per PR comments.