Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your great work on this.
You caught a number of glitches that we missed in previous reviews.

I went through this one time, and commented on the areas that introduced regressions, and
also asked questions about changes that I was not sure about.

Will merge my non-controversial fixes myself, and then leave the rest to you for review.

Also I think we may want to remove the ".vscode/settings.json" file entirely, or not?