[cvs-nhc98] patch applied (yhc): Fix up FreeVar2, move much to simply importing/exporting FreeVar3