This looks great, thank you! Could you clean up the few rogue whitespace issues? We try to avoid committing small whitespace changes because they end up flipping back and forth as people use different formatting standards.

Put a bit differently... if there are no functional changes on a given line, there should be no whitespace changes. I see a few places where tabs got (correctly) replaced with spaces on or near lines that actually had behavior changes, and those would be fine to include.

Much better, thanks! This is merged, and after your other PR runs another CI (I had to manually merge the test changes) we'll be good there too!