Egypt Listing In Scott Catalogue

The Scott catalogue never ceases to amaze me. I was going through my Egypt catalogue yesterday trying to figure out what airmail stamps I had and which were still missing (quite a lot of the more recent ones, it turned out). For some reason I was left with a number of stamps in my collection that I could not find in the C-section. It turned out that starting in 1995 (Sc.# 1593) airmail stamps that are part of a set are no longer listed in the airmail section, but in the general stamps section. Why is that? Doesn't this undermine the whole idea of listing the airmails separately? I would not mind, as I never liked the concept of separate B and C sections anyway as it breaks up sets artificially.

Are there other country listings where Scott does the same?

Jan-Simon