>If that's the case, then he's probably just as well off putting anything that is not actually a state or province in the country table. I imagine anything sent with an address of Guam or Puerto Rico will get to the right place without any mention of the U.S. on the label.

Yes, I think we should leave the current States (Provinces) and Countries tables as is.