I don’t care what the disclaimer says– Galaxy Quest’s spoof on the fans and actors of Star Trek was not an accident. I laughed out loud when I saw that. It was totally worth sitting through the credits.
I don’t really like the concept of “comedy” as a genre, because it overlaps with so many other genres. Something can be romantic comedy, or science fiction comedy, or fantasy comedy, or comedy plus pretty much any genre except tragedy. So I don’t think comedy really is a genre in itself.