Pending improvements

Addressing feedback from https://github.com/rspec/rspec-core/pull/1267 , includes a pretty important bug fix.

@myronmarston