VE-559: fix the tracking calls that still exist.