Now also tracking non-function client objects passed as parameters.