Remove use of map-wrapper from TypeRegistry