Add term into PROPERTY_VARIABLE string entry field so that we have an
option to migrate to using the term directly instead of the linked lists
that it stores.
Make sink and term meta-variables in F-then-Pattern-Ref, to
remove the Free declarations, per discussion.