I do think that's a way exports should look like, but still it would be better to avoid unrelated changes or maybe send then as separate pull request (you can keep it now, but try to avoid this in a future).