Small cleanup on environment path expansion.