I think the client.track refactor is unnecessary as the v1 code will eventually be removed. I'll make the `return` change here in a moment.