Several awkard constructs could be replaced by
list_del_init, list_for_each or list_empty.

Also two bugs fixes:
 free_device_names was freeing the wrong thing
 same_set wasn't initialised.