Work around RSpec deprecation warnings.

Smarter fix in progress.