Move typeof(CMClient) inline