Fixes some remaining issues with the change from the chunk-string to
chunk data.