This commit contains numerous Ruby 3 related fixes
and will make the cut-over easier once it is due.