Remove more backwards compat for old Ruby
And a bit more