Got the confirmation from AMEX and it did not even list the room type I had arranged to be upgraded to!
I called the hotel to confirm that we are registered for an Executive City View Suite. When I asked what amenities were included, the listed all of the FHR amenities.
Scary, isn't it? You really have to know what you're doing in this business.