wip: More progress on TcpDemultiplexer