Feel free to make this change after this pull request is completed. I don't know enough about this piece of the API to have an opinion on it.