Fix method signature 1.8.7

This includes a bug fix on 1.8.7 and a change needed for rspec/rspec-mocks#786.  Both were exposed by my work in that PR.  I plan to backport the bug fix but not the latter change.