MFC r322888:
Make entries for the United States more consistent.
As sbruno@'s entry wasn't merged back, also MFC r322336.