Improved handling of environments.