Chunk dispatch via the Descriptor class, and some cleanup