True. I do like the way he asks the bartender to stop serving water....
That one probably works better within the overall continuity. I feel this one (above) works better as an arc by itself. Plus, I suppose, the shock of recognition and the delight that he worked the poem so thoroughly into it may have coloured my reaction :P