Attempt to incorporate decompressed streams.
Clean up some exception compat from previous changes.