Less broken WeakMap dependency

This is what I get for doing it manually :/