Merge "More stdio cleanup."