Fixes to add compatibility with rspec-core 2.10.x.