Riker and Troi

Yar talks about the great qualities of each person who attended the funeral (luckily no one came who she didn’t mention. That would’ve been awkward). She says Riker always made her laugh. Was Riker supposed to be the comic relief this whole time?