I've never had a problem with either the "Deus Ex Machina" ending or the joke ending with Kelly and McCormick. People are always saying how they like to see serious things "deflated," and I think that ending did just that.
I have a TINY pet peeve with that curtain call ending, and that's that Frank Cady is missing from it. Was he unavailable for some reason?