Handle env vars where space eliminated by trimwhitespace.