Minor cleanup, add Proxy support to TcpSessionFactory