Be more careful with tracker handling.

 - When killing trackers, make sure the one we're killing is actually
   the same as the one we've been asked to kill.
 - Make sure we start the periodic timer when the startup timer fires.