Make message-id selection safer.