Code style changes and fixes for Ruby 1.8.7