Fixed bug where non-equal arbitraries would be returned by find-old-var-node.
Cleanup.