It's hard from me to tell from the diff if this is the right value for `expected_from`.  Did you verify that it is?  (I'm not sure that the specs would catch this if it was incorrect, unfortunately).

FWIW, we found this approach error-prone for our deprecation warnings, so we have been moving in the direction of looking through `caller` for the first non-rspec line:

https://github.com/rspec/rspec-core/blob/625ac905bbb1044f28c76ff080bf2253e4bc5531/lib/rspec/core/deprecation.rb#L8

It might be worth switching `expected_from` to use this mechanism, then it could avoid the issue altogether.  Thoughts?