Updated for recent NetBSD changes