More user environment variable protection.

See #114.