Merge underscore+typed versions together