This is draft fixes to NetBSD-current for PR#20390.