Ruby 1.9 compatibility; fix rspec deprecation warnings.