inch towards more map_trait cleanup for Typescript