Clean up, and tentative fix for stream content reader.