lose old hack in stream code, and other comment cleanups