So, I'm probably not going to change any of the weakMap stuff in this patch, as i think that is probably more than we want to change given that we want this patch to go into 1.2. Also its probably a more general discussion that needs to be had for a number of files where we use weakMaps to do private members.