This is the impression I've gotten. People try to be sensitive or PC with good intentions, but there's a lot of awkwardness still. Just seeing the replies to my question show that there doesn't seem to be a consensus for specific terms, but your advice to simply 'stay classy' seems to be the way to go.