Touch up for latest Ruby and RSpec.