We use references to the node directly rather than references supplied by the object. This should be more robust anyway and will fit better in the new node structure.