I will work on getting consistent behavior on the Windows side, moving away from pnpid.  This should correct the issue I raise above.