More changes to chunk streaming.