[cvs-nhc98] patch applied (yhc): Fix a rather serious uniqueVarsFunc bug, if the generated names clashed twice, then they weren't rewritten