Good points. I'll update the pull request accordingly.