Largely completed reworking of values to object, but still trying to get MongoOperations to do incremental updates with subtyping of child value in Map