> I specifically did NOT use __unused in this code because I also use it  
> in non-NetBSD environments.
> 
> Please check with me before you break this code again.

If this is that critical, shouldn't you be importing on a vendor
branch, then?