restructured NSMutableDictionary accesses