Some code clean-up, Discovery request handling now uses wptan_wait_for_message.