Polish the stream package, proper listener quit.