"So you were just trying to smooth things over."

That's...vaguely disappointing, in a way. Maybe he's reading it wrong, but if it's anything like York's normal behavior, it's akin to the way he smiles and jokes to cover up discomfort or sadness. Loneliness. Anything that bothers him.

This bothers him. He wouldn't be uncomfortable otherwise.