WIP fix for kw args issue - DO NOT MERGE

See https://github.com/rspec/rspec-mocks/pull/726
This is only so I can just work with two PRs rather than three while we get this ready :)