Slight refactoring for Ruby 1.9/RSpec + Travis ...