That's a pretty grounded and funny way to resolve him as a character, but it feels like the episode was teasing something ...