Fix deprecation warnings in RSpec 3, fully backwards compatible.