Small cleanup; a small fix for TrackerUtility.