Remove unneeded layer of indirection.
Fix doc string.
Merge pull request #1813 from rspec/a-few-small-changes

A few small changes