Merge "Use consistent style when checking env vars."