Ensure default groupings are applied to JSON-based inputs.
Update contexts to remove serialization from context classes.