Removing these isn't a fix. The next assertion fails w/ these restored, which shows that this PR is a breaking change.

Thanks, I didn't propose it as a non-breaking change. You are already doing versioned releases; this would be a new breaking release, no?

I removed those because they no longer apply as truthy - not as a fix, but a change.

I tried to keep the code style changes to a min.