Safer clean-up of environment variables: Do removal after insertions -> tcltest 2.3.7