Rely on the code in MatchAddress to do this work. Otherwise we fail to