Fix even more Ruby 1.8 compatibility