I found this seemingly-automatic ENVIRONMENT thing confusing, because it's just dumped out like that and we expect the release master to fix it up.  Seems like a natural for a command-line argument (eventually).