Happy to review.
I checked the changes into the current master. I’m not sure how to rebase (trying to get up to speed on GitHub) but it had the effect of squashing the changes which is probably a good thing. I created a new PR. Github is claiming it is mergeable so I’m hoping it is good to go.