Agreed. The way the writers joke about his suffering really killed the mood for me