Fix a straggling reference to netutil.TCPServer in comments.
Document and test the ability to call remove_timeout after it has fired.