Drop some remaining C{Array,List,Map} references.