ASIO fixes and clean-ups.