[iwhd] prepare to fix a GC/thread-related bug: no semantic change