Accommodate new recipient formats.