We are processing build failures from the upcoming ruby3.0 transition and I made these changes while looking into cqa-scanlogs. The review will be easier looking commit by commit.