Address deprecations for latest rspec.