Probably, but maybe not as part of this pull request.