Change from using a WeakMap to use expando
Merge pull request #253 from arv/less-weak-maps

Change from using a WeakMap to use expando