Slight optimization in reading descriptors.
Functorized the unmarshaller.