Fix test failures cased by changes in rspec-support's Differ.