There are some noteworthy changes here – some necessary to address Flow issues, some opinionated ones from me, and in some cases the new version of Flow identified actual type issues.
As such, putting the changes in this file up for review separately. I'll annotate the noteworthy changes inline.
Depends on D9852