oops: Fixup cid detection in thread body (again)