[cvs-nhc98] patch applied (yhc): Move to having FreeVar use the routines from FreeVar3