[cvs-nhc98] patch applied (yhc): Fix up collectAllVars in FreeVar and FreeVar3