Migrate more ThreadLocals