Clean up debug messages.
Record srvport also, otherwise the endpoints wouldn't match.