branch: fix a leak in dwim_and_setup_tracking