Switched to using Sets for free variables.
Merge branch 'Var-Sets'