Reorg thread info a bit.