Would it be cleaner to just make these always lists, even if they have just one element?