I think of myself as a writer with a sense of humour rather than a comedy writer. Happy to tell a story with lots of jokes in it - I wouldn't know how to do jokes without the story.
The trouble with a series as it gets older is it can feel like a tradition, and tradition is the enemy of suspense, and it's the enemy of comedy. It's the enemy of everything, really. So you have to shake it up.