Removed CallingObject from MethodCall and VariableUse. Added Index to VariableUse.