Fix even more instances of 'environment' that I missed.