FormatPhoneNumbers: fixes