Careful with tracker handling.

Another small fix here.  There were a couple other edge cases where the JT was messing up the TTs.  This seems to resolve it.

@florianleibert @benh @bmahler @vinodkone