Modified the bundle tracker to be even simpler, so that I wouldn't have to deal with various concurrency issues.