Fix #435.Refactor away overloads in 'os' stubs