If we hear that Kirby is being written out, I'd say that is a pretty good indication that this change in tone we've seen in the last three episodes is not some temporary thing.
I was listening to some co-workers discussing some sappy Hallmark movie one of them had watched recently. I can't stand those kinds of saccharine movies, but one of them mentioned how she loved "what he said in the ending scene". "Did he stick her head in the fireplace?" I asked sarcastically, and of course they looked at me like I was nuts. It then occurred to me that every time someone tries to describe a Hallmark movie, someone ought to add "...and then he stuck her head in the fireplace." Total conversation killer.