Add support for including built-in SS types and resolving TypeScript generic type name conflicts