Merge FreeTypeVars into TypeVars
Merge NewSubst class into HasVar class