Improvements to the logic and processing of collection and map fields.