Another place of using the free variables from the term instead of from the
property list.
Also add two TODO comments for old issues with reference counting in the
code that should be revisited.