classes: finish converting update-map to use hash-sets.