the comments I had are in the original pull request, BTW: #7425