I'm going to submit this as a pull request.