Partial changes to refactor how base classes and collections get serialized and parsed.