Merge "Start moving to current FreeBSD stdio."