fixup more id vs. thread_id_t