I was also thinking of “Dagger of the Mind.” When Kirk tries to reassure McCoy that the colony is more like a resort, he replies “A cage is a cage, Jim.” Always thought that was interesting, indicating McCoy is essentially a prison abolitionist, though not indicating that that is the dominant view that has won out in the federation.