Ruby 1.9-related cleanup