Remove redundant code left-over from the ref() stubbing change
Add caller file and line to MethodCalls

Create a base class Method for MethodCall and MethodStub