Added better altname checks based on Michael White's note.