Probably a good idea... but in a different pull request.