Refactor AssocList/List/String -> Map/Set/Text