Merge "Upgrade more functions to the current upstream NetBSD copy."