Improve ChunkSender

Oops I forgot to revert.