Refactor away overloads in 'os' stubs