Add specs for #1376 to prevent future regressions.

I forgot to add specs when I was fixing this before.
A few small doc improvements.
Remove code that is no longer needed.

We've updated rspec-expectations.
Merge pull request #1402 from rspec/a-few-misc-changes

A few misc changes