Wrote these while processing the first batch of ruby3.0 FTBFS bugs. Easier to review commit by commit.