I think that change should occur all at once, not as part of this pull request.  But yes, I agree with that change.