Converted more files to TypeScript.