Fix regression in entry_to_env()