Also note as already pointed out in other comment some weak maps will be replaced by weak sets that have diff API etc.. Changing one accessor function rather than all accesses is a lot less error prone.