Improved domain host handling.