Changes to fix addVar( "*" ) problem.