More TypeScript work.