Chunk class reworkings.