As mentioned on IRC, change StreamData and use unique_ptr here?