That might be better as a separate pull request.