Fixing issues stemming from previous commit in Ruby 1.8.x.