Switch just CallerFilter over to rspec-support

An alternative to / part of #1115, this is just moving the CallerFilter across