Your changes look good to me, I added them to the PR.