Change from external modules to internal modules
Reversed order of string / number overloads to work around https://github.com/Microsoft/TypeScript/issues/167