Improved env var completion