Try to fix waitid() based code.