Expand the coverage to include my old phone aliases and so forth too