@bmispelon - I actually separated them on purpose, because they represent different logical paths. `app_list_value` is None means that an app was seen in an include-all-models way [it's unfortunate that None is used for this purpose in the code...]. Merging the two conditions together would IMHO make it harder to understand the relation between them.

But I don't feel strongly about this, so if you think it would be clearer that way, I can change it.