master
ts: refactor TS entries to satisfy recent TS versions and modern usage, as well as fix duplicated type definitions.