One of the things I liked about TNG is the subtlety with which they could handle humor. "Second Chances" is on BBC America right now
There's another great subtle comedy sting in that episode, where Worf and Data are discussing Will and Tom. Worf asmits that he is not easy to get along with, and Data just agrees with him (which is funny enough on its own) and Worf instantly shoots him a look. He just glares at him for a moment before deciding to move on.