Merge "Sync with current OpenBSD stdio."