More track interrupts cleanup.