nano-store 0.6.1 → 0.6.2

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSortDescriptor.h

@@ -75,7 +75,7 @@
 @interface NSFNanoSortDescriptor : NSObject
 
 /** * The property key to use when performing a comparison */
-@property (nonatomic, copy, readonly) NSString *attribute;
+@property (nonatomic, readonly) NSString *attribute;
 /** * The property to indicate whether the comparison should be performed in ascending mode */
 @property (nonatomic, readonly) BOOL isAscending;
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSortDescriptor.m

@@ -29,16 +29,15 @@
 #import "NSFOrderedDictionary.h"
 #import "NSFNanoObject_Private.h"
 
-@interface NSFNanoSortDescriptor ()
-
-/** \cond */
-@property (nonatomic, copy, readwrite) NSString *attribute;
-@property (nonatomic, readwrite) BOOL isAscending;
-/** \endcond */
-
-@end
-
 @implementation NSFNanoSortDescriptor
+{
+    /** \cond */
+    NSString    *attribute;
+    BOOL        isAscending;
+    /** \endcond */
+}
+
+@synthesize attribute, isAscending;
 
 + (NSFNanoSortDescriptor *)sortDescriptorWithAttribute:(NSString *)theAttribute ascending:(BOOL)ascending
 {
@@ -53,8 +52,8 @@
                                userInfo:nil]raise];
     
     if ((self = [super init])) {
-        _attribute = theAttribute;
-        _isAscending = ascending;
+        attribute = [theAttribute copy];
+        isAscending = ascending;
     }
     
     return self;
@@ -77,8 +76,8 @@
     NSFOrderedDictionary *values = [NSFOrderedDictionary new];
     
     values[@"Sort descriptor address"] = [NSString stringWithFormat:@"%p", self];
-    values[@"Attribute"] = _attribute;
-    values[@"Is ascending?"] = (_isAscending ? @"YES" : @"NO");
+    values[@"Attribute"] = attribute;
+    values[@"Is ascending?"] = (isAscending ? @"YES" : @"NO");
     
     return values;
 }

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.m

@@ -6,7 +6,7 @@
      
      Redistribution and use in source and binary forms, with or without modification, are permitted
      provided that the following conditions are met:
- 
+     
      * Redistributions of source code must retain the above copyright notice, this list of conditions
      and the following disclaimer.
      * Redistributions in binary form must reproduce the above copyright notice, this list of conditions
@@ -33,21 +33,20 @@
 
 #include <stdlib.h>
 
-@interface NSFNanoStore ()
-
-/** \cond */
-@property (nonatomic, strong, readwrite) NSFNanoEngine *nanoStoreEngine;
-@property (nonatomic, readwrite) BOOL hasUnsavedChanges;
-@property (nonatomic) NSMutableArray *addedObjects;
-@property (nonatomic) BOOL isOurTransaction;
-@property (nonatomic, assign) sqlite3_stmt *insertDeleteKeysStatement;
-@property (nonatomic, assign) sqlite3_stmt *storeValuesStatement;
-@property (nonatomic, assign) sqlite3_stmt *storeKeysStatement;
-/** \endcond */
-
-@end
-
 @implementation NSFNanoStore
+{
+@protected
+    NSFNanoEngine               *nanoStoreEngine;
+    NSFEngineProcessingMode     nanoEngineProcessingMode;
+    NSUInteger                  saveInterval;
+    
+    /** \cond */
+    NSMutableArray              *addedObjects;
+    BOOL                        _isOurTransaction;
+    sqlite3_stmt                *_storeValuesStatement;
+    sqlite3_stmt                *_storeKeysStatement;
+    /** \endcond */
+}
 
 @synthesize nanoStoreEngine;
 @synthesize nanoEngineProcessingMode;
@@ -102,11 +101,10 @@
         _isOurTransaction = NO;
         saveInterval = 1;
         
-        _insertDeleteKeysStatement = NULL;
         _storeValuesStatement = NULL;
         _storeKeysStatement = NULL;
         
-        _addedObjects = [[NSMutableArray alloc]initWithCapacity:saveInterval];
+        addedObjects = [[NSMutableArray alloc]initWithCapacity:saveInterval];
     }
     
     return self;
@@ -115,6 +113,8 @@
 - (void)dealloc
 {
     [self closeWithError:nil];
+    
+    
 }
 
 - (NSString *)filePath
@@ -204,7 +204,7 @@
 
 - (BOOL)hasUnsavedChanges
 {
-    return ([_addedObjects count] > 0);
+    return ([addedObjects count] > 0);
 }
 
 #pragma mark -
@@ -225,12 +225,11 @@
     }
     
     if ([someObjects count] == 0) {
-        if (nil != outError) {
+        if (nil != outError)
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
                                         userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: ([someObjects count] == 0)", [self class], NSStringFromSelector(_cmd)]
                                                                              forKey:NSLocalizedFailureReasonErrorKey]];
-        }
         return NO;
     }
     
@@ -241,17 +240,32 @@
         // If it's a bag, make sure the name is unique
         if (YES == [object isKindOfClass:[NSFNanoBag class]]) {
             NSFNanoBag *bag = (NSFNanoBag *)object;
+            NSString *bagName = bag.name;
+            if (bagName.length > 0) {
+                NSFNanoBag *bagWithSameName = [self bagWithName:bagName];
+                if (nil != bagWithSameName) {
+                    if (nil != outError) {
+                        *outError = [NSError errorWithDomain:NSFDomainKey
+                                                        code:NSFNanoStoreErrorKey
+                                                    userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: a bag named '%@' already exists.", [self class], NSStringFromSelector(_cmd), bagName]
+                                                                                         forKey:NSLocalizedFailureReasonErrorKey]];
+                        
+                        return NO;
+                    }
+                }
+            }
+            
             
             // If it's a bag, process it first by gathering. If it's not dirty, there's no need to save...
-            if (YES == [bag hasUnsavedChanges]) {
+            if (YES == [object hasUnsavedChanges]) {
                 NSError *error = nil;
                 
                 // Associate the bag to this store
-                if (nil == [bag store]) {
+                if (nil == [object store]) {
                     [object _setStore:self];
                 }
                 
-                if (NO == [bag _saveInStore:self error:&error]) {
+                if (NO == [object _saveInStore:self error:&error]) {
                     [[NSException exceptionWithName:NSFNanoStoreUnableToManipulateStoreException
                                              reason:[NSString stringWithFormat:@"*** -[%@ %@]: %@", [self class], NSStringFromSelector(_cmd), [error localizedDescription]]
                                            userInfo:nil]raise];
@@ -307,38 +321,31 @@
     NSString *theSQLStatement = [[NSString alloc]initWithFormat:@"CREATE TEMP TABLE %@(x);", NSF_Private_ToDeleteTableKey];
     [nanoStoreEngine executeSQL:theSQLStatement];
     
-    if (NULL == _insertDeleteKeysStatement) {
-        theSQLStatement = [[NSString alloc]initWithFormat:@"INSERT INTO %@ VALUES (?);", NSF_Private_ToDeleteTableKey];
-        BOOL success = [self _prepareSQLite3Statement:&_insertDeleteKeysStatement theSQLStatement:theSQLStatement];
-        if (NO == success) {
-            if (nil != outError) {
-                *outError = [NSError errorWithDomain:NSFDomainKey
-                                                code:NSFNanoStoreErrorKey
-                                            userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: failed to prepare _insertDeleteKeysStatement.", [self class], NSStringFromSelector(_cmd)]
-                                                                                 forKey:NSLocalizedFailureReasonErrorKey]];
-            }
-            return NO;
-        }
-    }
+    sqlite3_stmt *statement;
+    theSQLStatement = [[NSString alloc]initWithFormat:@"INSERT INTO %@ VALUES (?);", NSF_Private_ToDeleteTableKey];
+    BOOL success = [self _prepareSQLite3Statement:&statement theSQLStatement:theSQLStatement];
     
-    for (NSString *key in someKeys) {
-        int status = sqlite3_reset (_insertDeleteKeysStatement);
-        if (SQLITE_OK != status) {
-            break;
-        }
-        
-        // Bind and execute the statement...
-        status = sqlite3_bind_text ( _insertDeleteKeysStatement, 1, [key UTF8String], -1, SQLITE_STATIC);
-        
-        // Since we're operating with extended result code support, extract the bits
-        // and obtain the regular result code
-        // For more info check: http://www.sqlite.org/c3ref/c_ioerr_access.html
-        
-        status = [NSFNanoEngine NSFP_stripBitsFromExtendedResultCode:status];
-        
-        if (SQLITE_OK == status) {
-            [self _executeSQLite3StepUsingSQLite3Statement:_insertDeleteKeysStatement];
+    if (success) {
+        for (NSString *key in someKeys) {
+            int status = sqlite3_reset (statement);
+            if (SQLITE_OK != status) {
+                break;
+            }
+            
+            // Bind and execute the statement...
+            status = sqlite3_bind_text ( statement, 1, [key UTF8String], -1, SQLITE_STATIC);
+            
+            // Since we're operating with extended result code support, extract the bits
+            // and obtain the regular result code
+            // For more info check: http://www.sqlite.org/c3ref/c_ioerr_access.html
+            
+            status = [NSFNanoEngine NSFP_stripBitsFromExtendedResultCode:status];
+            
+            if (SQLITE_OK == status) {
+                [self _executeSQLite3StepUsingSQLite3Statement:statement];
+            }
         }
+        sqlite3_finalize(statement);
     }
     
     _NSFLog(@"          Before removing the keys to be stored from NSFKeys...");
@@ -559,7 +566,7 @@
 - (BOOL)saveStoreAndReturnError:(out NSError **)outError
 {
     // We are really not saving anything new, just indicating that we should commit the unsaved changes.
-    if (NO == _hasUnsavedChanges) {
+    if (NO == self.hasUnsavedChanges) {
         return YES;
     }
     
@@ -568,7 +575,7 @@
 
 - (void)discardUnsavedChanges
 {
-    [_addedObjects removeAllObjects];
+    [addedObjects removeAllObjects];
 }
 
 // ----------------------------------------------
@@ -670,12 +677,11 @@
         return NO;
     
     if ([[self nanoStoreEngine]isTransactionActive]) {
-        if (nil != outError) {
+        if (nil != outError)
             *outError = [NSError errorWithDomain:NSFDomainKey
                                             code:NSFNanoStoreErrorKey
                                         userInfo:[NSDictionary dictionaryWithObject:@"Cannot backup store. A transaction is still open."
                                                                              forKey:NSLocalizedDescriptionKey]];
-        }
         return NO;
     }
     
@@ -723,38 +729,31 @@
         NSString *theSQLStatement = [[NSString alloc]initWithFormat:@"INSERT INTO %@(%@, %@, %@, %@) VALUES (?,?,?,?);", NSFValues, NSFKey, NSFAttribute, NSFValue, NSFDatatype];
         hasInitializationSucceeded = [self _prepareSQLite3Statement:&_storeValuesStatement theSQLStatement:theSQLStatement];
         
-        if (NO == hasInitializationSucceeded) {
-            if (nil != outError) {
-                *outError = [NSError errorWithDomain:NSFDomainKey
-                                                code:NSFNanoStoreErrorKey
-                                            userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: failed to prepare _storeValuesStatement.", [self class], NSStringFromSelector(_cmd)]
-                                                                                 forKey:NSLocalizedFailureReasonErrorKey]];
-            }
-            return NO;
+        if ((nil != outError) && (NO == hasInitializationSucceeded)) {
+            *outError = [NSError errorWithDomain:NSFDomainKey
+                                            code:NSFNanoStoreErrorKey
+                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: failed to prepare _storeValuesStatement.", [self class], NSStringFromSelector(_cmd)]
+                                                                             forKey:NSLocalizedFailureReasonErrorKey]];
         }
     }
     
-    if (NULL == _storeKeysStatement) {
+    if ((NULL == _storeKeysStatement) && (YES == hasInitializationSucceeded)) {
         NSString *theSQLStatement = [[NSString alloc]initWithFormat:@"INSERT INTO %@(%@, %@, %@, %@) VALUES (?,?,?,?);", NSFKeys, NSFKey, NSFKeyedArchive, NSFCalendarDate, NSFObjectClass];
         hasInitializationSucceeded = [self _prepareSQLite3Statement:&_storeKeysStatement theSQLStatement:theSQLStatement];
         
-        if (NO == hasInitializationSucceeded) {
-            if (nil != outError) {
-                *outError = [NSError errorWithDomain:NSFDomainKey
-                                                code:NSFNanoStoreErrorKey
-                                            userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: failed to prepare _storeKeysStatement.", [self class], NSStringFromSelector(_cmd)]
-                                                                                 forKey:NSLocalizedFailureReasonErrorKey]];
-            }
-            return NO;
+        if ((nil != outError) && (NO == hasInitializationSucceeded)) {
+            *outError = [NSError errorWithDomain:NSFDomainKey
+                                            code:NSFNanoStoreErrorKey
+                                        userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: failed to prepare _storeKeysStatement.", [self class], NSStringFromSelector(_cmd)]
+                                                                             forKey:NSLocalizedFailureReasonErrorKey]];
         }
     }
     
-    return YES;
+    return hasInitializationSucceeded;
 }
 
 - (void)_releasePreparedStatements
 {
-    if (_insertDeleteKeysStatement != NULL) { sqlite3_finalize(_insertDeleteKeysStatement);_insertDeleteKeysStatement = NULL; }
     if (_storeValuesStatement != NULL) { sqlite3_finalize(_storeValuesStatement);_storeValuesStatement = NULL; }
     if (_storeKeysStatement != NULL) { sqlite3_finalize(_storeKeysStatement);_storeKeysStatement = NULL; }
 }
@@ -1121,10 +1120,10 @@
 - (BOOL)_addObjectsFromArray:(NSArray *)someObjects forceSave:(BOOL)forceSave error:(out NSError **)outError
 {
     // Collect the objects
-    [_addedObjects addObjectsFromArray:someObjects];
+    [addedObjects addObjectsFromArray:someObjects];
     
     // No need to continue if there's nothing to be saved
-    NSUInteger unsavedObjectsCount = [_addedObjects count];
+    NSUInteger unsavedObjectsCount = [addedObjects count];
     if (0 == unsavedObjectsCount) {
         return YES;
     }
@@ -1139,9 +1138,9 @@
         
         // Remove all objects non conforming with the NSFNanoObjectProtocol
         while ( i-- ) {
-            id object = [_addedObjects objectAtIndex:i];
+            id object = [addedObjects objectAtIndex:i];
             if (NO == [object conformsToProtocol:@protocol(NSFNanoObjectProtocol)]) {
-                [_addedObjects removeObjectAtIndex:i];
+                [addedObjects removeObjectAtIndex:i];
                 i--;
                 continue;
             }
@@ -1156,7 +1155,7 @@
         }
         
         // Recalculate how many elements we have left
-        unsavedObjectsCount = [_addedObjects count];
+        unsavedObjectsCount = [addedObjects count];
         
         if (unsavedObjectsCount > 0) {
             NSError *localOutError = nil;
@@ -1180,7 +1179,7 @@
             self.saveInterval = 1;
         }
         
-        for (id object in _addedObjects) {
+        for (id object in addedObjects) {
             @autoreleasepool {
                 // If the object was originally created by storing a class not recognized by this process, honor it and store it with the right class string.
                 NSString *className = nil;
@@ -1242,7 +1241,7 @@
         double ratio = unsavedObjectsCount/secondsStoring;
         _NSFLog(@"     Done. Storing the objects took %.3f seconds (%.0f keys/sec.)", secondsStoring, ratio);
         
-        [_addedObjects removeAllObjects];
+        [addedObjects removeAllObjects];
     }
     
     return YES;

data/vendor/Pods/NanoStore/Classes/Public/NanoStore.h

@@ -64,13 +64,6 @@
  - iOS library runs on the device and simulator
  - ARC compliant
  
- @section latest_changes Latest changes
- v2.5 - January 1, 2013
- 
- Starting with v2.5, the plist mechanism has been replaced with NSKeyedArchiver. There are several reasons for it: it's more compact, faster and uses less memory. Perhaps the most important reason is that it opens the possibility to store other data types.
- 
- NSNull is now supported. Big thanks to Wanny (https://github.com/mrwanny) for taking the time to improve this section of NanoStore.
- 
  @section installation_sec Installation
  
  Building NanoStore is very easy. Just follow these steps:
@@ -430,35 +423,6 @@
  [sortByLastName release];
  @endcode
 
- @section paging_limit_sec Paging using Limit and Offset
- SQLite provides a really cool feature called OFFSET that is usually used with a LIMIT clause.
- 
- The LIMIT clause is used to limit the number of results returned in a SQL statement. So if you have 1000 rows in table, but only want to return the first 10, you would do something like this:
- @code
- SELECT column FROM table LIMIT 10
- @endcode
- Now suppose you wanted to show results 11-20. With the OFFSET keyword it's just as easy. The following query will do:
- @code
- SELECT column FROM table LIMIT 10 OFFSET 10
- @endcode
- Using pagination is also quite easy with NanoStore. This example based on one of the unit tests provided with the NanoStore distro:
- @code
- NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStoreType path:nil error:nil];
- 
- // Assume we have added objects to the store
- 
- NSFNanoSearch *search = [NSFNanoSearch searchWithStore:nanoStore];
- search.value = @"Barcelona";
- search.match = NSFEqualTo;
- search.limit = 5;
- search.offset = 3;
- 
- NSDictionary *searchResults = [search searchObjectsWithReturnType:NSFReturnObjects error:nil];
- 
- // Assuming the query matches some results, NanoStore should have retrieved
- // the first 5 records right after the 3rd one from the result set.
- @endcode
- 
  @section performancetips_sec Performance Tips
  
  NanoStore by defaults saves every object to disk one by one. To speed up inserts and edited objects, increase NSFNanoStore's \link NSFNanoStore::saveInterval saveInterval \endlink property.

data/vendor/Pods/Pods.bridgesupport

@@ -1,40 +1,40 @@
 <?xml version='1.0'?>
 <signatures version='1.0'>
-<constant const='true' name='NSFAttribute' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFCalendarDate' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFDatatype' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFDomainKey' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFKey' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFKeyedArchive' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFKeys' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFMemoryDatabase' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFNanoObjectBehaviorException' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFNanoStoreErrorKey' declared_type='NSInteger' type='i'/>
-<constant const='true' name='NSFNanoStoreUnableToManipulateStoreException' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFNonConformingNanoObjectProtocolException' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFObjectClass' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFP_ColumnIdentifier' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFP_DatatypeIdentifier' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFP_FullDatatypeIdentifier' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFP_SchemaTable' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFP_TableIdentifier' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFRowIDColumnName' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFTemporaryDatabase' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFUnexpectedParameterException' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFValue' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFValues' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSFVersionKey' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_InvalidParameterDataCodeKey' declared_type='NSInteger' type='i'/>
-<constant const='true' name='NSF_Private_MacOSXErrorCodeKey' declared_type='NSInteger' type='i'/>
-<constant const='true' name='NSF_Private_NSFKeys_NSFKey' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_NSFKeys_NSFKeyedArchive' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_NSFNanoBag_NSFKey' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_NSFNanoBag_NSFObjectKeys' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_NSFNanoBag_Name' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_NSFValues_NSFAttribute' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_NSFValues_NSFKey' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_NSFValues_NSFValue' declared_type='NSString*' type='@'/>
-<constant const='true' name='NSF_Private_ToDeleteTableKey' declared_type='NSString*' type='@'/>
+<constant const='true' type='@' name='NSFAttribute' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFCalendarDate' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFDatatype' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFDomainKey' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFKey' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFKeyedArchive' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFKeys' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFMemoryDatabase' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFNanoObjectBehaviorException' declared_type='NSString*'/>
+<constant const='true' type='i' name='NSFNanoStoreErrorKey' declared_type='NSInteger'/>
+<constant const='true' type='@' name='NSFNanoStoreUnableToManipulateStoreException' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFNonConformingNanoObjectProtocolException' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFObjectClass' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFP_ColumnIdentifier' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFP_DatatypeIdentifier' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFP_FullDatatypeIdentifier' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFP_SchemaTable' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFP_TableIdentifier' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFRowIDColumnName' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFTemporaryDatabase' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFUnexpectedParameterException' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFValue' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFValues' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSFVersionKey' declared_type='NSString*'/>
+<constant const='true' type='i' name='NSF_Private_InvalidParameterDataCodeKey' declared_type='NSInteger'/>
+<constant const='true' type='i' name='NSF_Private_MacOSXErrorCodeKey' declared_type='NSInteger'/>
+<constant const='true' type='@' name='NSF_Private_NSFKeys_NSFKey' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_NSFKeys_NSFKeyedArchive' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_NSFNanoBag_NSFKey' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_NSFNanoBag_NSFObjectKeys' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_NSFNanoBag_Name' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_NSFValues_NSFAttribute' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_NSFValues_NSFKey' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_NSFValues_NSFValue' declared_type='NSString*'/>
+<constant const='true' type='@' name='NSF_Private_ToDeleteTableKey' declared_type='NSString*'/>
 <enum value='1' name='CacheAllData'/>
 <enum value='2' name='CacheDataOnDemand'/>
 <enum value='3' name='DoNotCacheData'/>
@@ -77,7 +77,6 @@
 <enum value='2' name='NSFNanoTypeString'/>
 <enum value='6' name='NSFNanoTypeURL'/>
 <enum value='-1' name='NSFNanoTypeUnknown'/>
-<enum value='10' name='NSFNotEqualTo'/>
 <enum value='2' name='NSFOnDate'/>
 <enum value='2' name='NSFOr'/>
 <enum value='3' name='NSFPersistentStoreType'/>
@@ -93,1265 +92,1258 @@
 <enum value='1' name='TempStoreModeFile'/>
 <enum value='2' name='TempStoreModeMemory'/>
 <function name='NSFIsDebugOn'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </function>
 <function name='NSFNanoDatatypeFromString'>
-<arg name='aNanoDatatype' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoDatatype' type='i'/>
+<arg type='@' name='aNanoDatatype' declared_type='NSString*'/>
+<retval type='i' declared_type='NSFNanoDatatype'/>
 </function>
 <function name='NSFSetIsDebugOn'>
-<arg name='flag' declared_type='BOOL' type='B'/>
-<retval declared_type='void' type='v'/>
+<arg type='B' name='flag' declared_type='BOOL'/>
+<retval type='v' declared_type='void'/>
 </function>
 <function name='NSFStringFromMatchType'>
-<arg name='aMatchType' declared_type='NSFMatchType' type='i'/>
-<retval declared_type='NSString*' type='@'/>
+<arg type='i' name='aMatchType' declared_type='NSFMatchType'/>
+<retval type='@' declared_type='NSString*'/>
 </function>
 <function name='NSFStringFromNanoDataType'>
-<arg name='aNanoDatatype' declared_type='NSFNanoDatatype' type='i'/>
-<retval declared_type='NSString*' type='@'/>
+<arg type='i' name='aNanoDatatype' declared_type='NSFNanoDatatype'/>
+<retval type='@' declared_type='NSString*'/>
 </function>
 <function name='safeJSONArrayFromArray'>
-<arg name='array' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg type='@' name='array' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSArray*'/>
 </function>
 <function name='safeJSONDictionaryFromDictionary'>
-<arg name='dictionary' declared_type='NSDictionary*' type='@'/>
-<retval declared_type='NSDictionary*' type='@'/>
+<arg type='@' name='dictionary' declared_type='NSDictionary*'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </function>
 <function name='safeJSONObjectFromObject'>
-<arg name='object' declared_type='id' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg type='@' name='object' declared_type='id'/>
+<retval type='@' declared_type='id'/>
 </function>
 <class name='NSFNanoBag'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_inflateObjectsWithKeys:'>
-<arg index='0' name='someKeys' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='someKeys' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_saveInStore:error:'>
-<arg index='0' name='someStore' declared_type='NSFNanoStore*' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='someStore' declared_type='NSFNanoStore*'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_setStore:'>
-<arg index='0' name='aStore' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='aStore' declared_type='NSFNanoStore*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='addObject:error:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theObject' declared_type='id'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='addObjectsFromArray:error:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theObjects' declared_type='NSArray*'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='bag' class_method='true'>
-<retval declared_type='NSFNanoBag*' type='@'/>
+<retval type='@' declared_type='NSFNanoBag*'/>
 </method>
 <method selector='bagWithName:' class_method='true'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theName' declared_type='NSString*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='bagWithName:andObjects:' class_method='true'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
-<arg index='1' name='theObjects' declared_type='NSArray*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theName' declared_type='NSString*'/>
+<arg index='1' type='@' name='theObjects' declared_type='NSArray*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='bagWithObjects:' class_method='true'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSFNanoBag*' type='@'/>
+<arg index='0' type='@' name='theObjects' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSFNanoBag*'/>
 </method>
 <method selector='count'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='deflateBag'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='dictionaryRepresentation'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='hasUnsavedChanges'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='inflateBag'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='initBagWithName:andObjects:'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
-<arg index='1' name='someObjects' declared_type='NSArray*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theName' declared_type='NSString*'/>
+<arg index='1' type='@' name='someObjects' declared_type='NSArray*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='isEqualToNanoBag:'>
-<arg index='0' name='otherNanoBag' declared_type='NSFNanoBag*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='otherNanoBag' declared_type='NSFNanoBag*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='key'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='name'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='reloadBagWithError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='removeAllObjects'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='removeObject:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theObject' declared_type='id'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='removeObjectWithKey:'>
-<arg index='0' name='theObjectKey' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theObjectKey' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='removeObjectsInArray:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theObjects' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='removeObjectsWithKeysInArray:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theKeys' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='removedObjects'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='saveAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='savedObjects'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='setName:'>
-<arg index='0' name='name' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='name' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setStore:'>
-<arg index='0' name='store' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='store' declared_type='NSFNanoStore*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='store'>
-<retval declared_type='NSFNanoStore*' type='@'/>
+<retval type='@' declared_type='NSFNanoStore*'/>
 </method>
 <method selector='undoChangesWithError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='unsavedObjects'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 </class>
 <class name='NSFNanoEngine'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='NSFEncodingTypeToNSString:' class_method='true'>
-<arg index='0' name='value' declared_type='NSFEncodingType' type='i'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='i' name='value' declared_type='NSFEncodingType'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='NSFP_ROWIDPresenceLocation:datatypes:'>
-<arg index='0' name='tableColumns' declared_type='NSArray*' type='@'/>
-<arg index='1' name='datatypes' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSInteger' type='i'/>
+<arg index='0' type='@' name='tableColumns' declared_type='NSArray*'/>
+<arg index='1' type='@' name='datatypes' declared_type='NSArray*'/>
+<retval type='i' declared_type='NSInteger'/>
 </method>
 <method selector='NSFP_beginTransactionMode:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSString*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='NSFP_cacheMethodToString'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='NSFP_createTable:withColumns:datatypes:isTemporary:'>
-<arg index='0' name='table' declared_type='NSString*' type='@'/>
-<arg index='1' name='tableColumns' declared_type='NSArray*' type='@'/>
-<arg index='2' name='tableDatatypes' declared_type='NSArray*' type='@'/>
-<arg index='3' name='isTemporaryFlag' declared_type='BOOL' type='B'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='table' declared_type='NSString*'/>
+<arg index='1' type='@' name='tableColumns' declared_type='NSArray*'/>
+<arg index='2' type='@' name='tableDatatypes' declared_type='NSArray*'/>
+<arg index='3' type='B' name='isTemporaryFlag' declared_type='BOOL'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='NSFP_datatypeForColumn:'>
-<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoDatatype' type='i'/>
+<arg index='0' type='@' name='tableAndColumn' declared_type='NSString*'/>
+<retval type='i' declared_type='NSFNanoDatatype'/>
 </method>
 <method selector='NSFP_datatypeForTable:column:'>
-<arg index='0' name='table' declared_type='NSString*' type='@'/>
-<arg index='1' name='column' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoDatatype' type='i'/>
+<arg index='0' type='@' name='table' declared_type='NSString*'/>
+<arg index='1' type='@' name='column' declared_type='NSString*'/>
+<retval type='i' declared_type='NSFNanoDatatype'/>
 </method>
 <method selector='NSFP_decodeQuantum:andSource:' class_method='true'>
-<arg index='0' name='dest' declared_type='unsigned char*' type='*'/>
-<arg const='true' index='1' name='src' declared_type='char*' type='*'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='*' name='dest' declared_type='unsigned char*'/>
+<arg index='1' const='true' type='*' name='src' declared_type='char*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='NSFP_flattenAllTables'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='NSFP_insertStringValues:forColumns:table:'>
-<arg index='0' name='values' declared_type='NSArray*' type='@'/>
-<arg index='1' name='columns' declared_type='NSArray*' type='@'/>
-<arg index='2' name='table' declared_type='NSString*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='values' declared_type='NSArray*'/>
+<arg index='1' type='@' name='columns' declared_type='NSArray*'/>
+<arg index='2' type='@' name='table' declared_type='NSString*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='NSFP_installCommitCallback'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='NSFP_isColumnROWIDAlias:forTable:'>
-<arg index='0' name='column' declared_type='NSString*' type='@'/>
-<arg index='1' name='table' declared_type='NSString*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='column' declared_type='NSString*'/>
+<arg index='1' type='@' name='table' declared_type='NSString*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='NSFP_nestedDescriptionWithPrefixedSpace:'>
-<arg index='0' name='prefixedSpace' declared_type='NSString*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='prefixedSpace' declared_type='NSString*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='NSFP_prefixWithDotDelimiter:'>
-<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='tableAndColumn' declared_type='NSString*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='NSFP_prepareSQLite3Statement:theSQLStatement:'>
-<arg index='0' name='aStatement' declared_type='sqlite3_stmt**' type='^^{sqlite3_stmt}'/>
-<arg index='1' name='aSQLQuery' declared_type='NSString*' type='@'/>
-<retval declared_type='NSInteger' type='i'/>
+<arg index='0' type='^^{sqlite3_stmt}' name='aStatement' declared_type='sqlite3_stmt**'/>
+<arg index='1' type='@' name='aSQLQuery' declared_type='NSString*'/>
+<retval type='i' declared_type='NSInteger'/>
 </method>
 <method selector='NSFP_rebuildDatatypeCache'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='NSFP_removeColumn:fromTable:'>
-<arg index='0' name='column' declared_type='NSString*' type='@'/>
-<arg index='1' name='table' declared_type='NSString*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='column' declared_type='NSString*'/>
+<arg index='1' type='@' name='table' declared_type='NSString*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='NSFP_setFullColumnNamesEnabled'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='NSFP_sharedROWIDKeywords' class_method='true'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='NSFP_sqlString:appendingTags:'>
-<arg index='0' name='theSQLStatement' declared_type='NSMutableString*' type='@'/>
-<arg index='1' name='columns' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSMutableString*'/>
+<arg index='1' type='@' name='columns' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='NSFP_sqlString:appendingTags:quoteTags:'>
-<arg index='0' name='theSQLStatement' declared_type='NSMutableString*' type='@'/>
-<arg index='1' name='tags' declared_type='NSArray*' type='@'/>
-<arg index='2' name='flag' declared_type='BOOL' type='B'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSMutableString*'/>
+<arg index='1' type='@' name='tags' declared_type='NSArray*'/>
+<arg index='2' type='B' name='flag' declared_type='BOOL'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='NSFP_sqlString:forTable:withColumns:datatypes:'>
-<arg index='0' name='theSQLStatement' declared_type='NSMutableString*' type='@'/>
-<arg index='1' name='table' declared_type='NSString*' type='@'/>
-<arg index='2' name='columns' declared_type='NSArray*' type='@'/>
-<arg index='3' name='datatypes' declared_type='NSArray*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSMutableString*'/>
+<arg index='1' type='@' name='table' declared_type='NSString*'/>
+<arg index='2' type='@' name='columns' declared_type='NSArray*'/>
+<arg index='3' type='@' name='datatypes' declared_type='NSArray*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='NSFP_stripBitsFromExtendedResultCode:' class_method='true'>
-<arg index='0' name='extendedResult' declared_type='int' type='i'/>
-<retval declared_type='int' type='i'/>
+<arg index='0' type='i' name='extendedResult' declared_type='int'/>
+<retval type='i' declared_type='int'/>
 </method>
 <method selector='NSFP_suffixWithDotDelimiter:'>
-<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='tableAndColumn' declared_type='NSString*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='NSFP_uninstallCommitCallback'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='NSStringToNSFEncodingType:' class_method='true'>
-<arg index='0' name='value' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFEncodingType' type='i'/>
+<arg index='0' type='@' name='value' declared_type='NSString*'/>
+<retval type='i' declared_type='NSFEncodingType'/>
 </method>
 <method selector='_plistToDictionary:' class_method='true'>
-<arg index='0' name='aPlist' declared_type='NSString*' type='@'/>
-<retval declared_type='NSDictionary*' type='@'/>
+<arg index='0' type='@' name='aPlist' declared_type='NSString*'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='allTables'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='beginDeferredTransaction'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='beginTransaction'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='busyTimeout'>
-<retval declared_type='unsigned int' type='I'/>
+<retval type='I' declared_type='unsigned int'/>
 </method>
 <method selector='cacheMethod'>
-<retval declared_type='NSFCacheMethod' type='i'/>
+<retval type='i' declared_type='NSFCacheMethod'/>
 </method>
 <method selector='cacheSize'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='close'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='columnsForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theTable' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='commitTransaction'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='compact'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='createIndexForColumn:table:isUnique:'>
-<arg index='0' name='theColumn' declared_type='NSString*' type='@'/>
-<arg index='1' name='theTable' declared_type='NSString*' type='@'/>
-<arg index='2' name='isUnique' declared_type='BOOL' type='B'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theColumn' declared_type='NSString*'/>
+<arg index='1' type='@' name='theTable' declared_type='NSString*'/>
+<arg index='2' type='B' name='isUnique' declared_type='BOOL'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='createTable:withColumns:datatypes:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
-<arg index='1' name='theColumns' declared_type='NSArray*' type='@'/>
-<arg index='2' name='theDatatypes' declared_type='NSArray*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theTable' declared_type='NSString*'/>
+<arg index='1' type='@' name='theColumns' declared_type='NSArray*'/>
+<arg index='2' type='@' name='theDatatypes' declared_type='NSArray*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='databaseWithPath:' class_method='true'>
-<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='thePath' declared_type='NSString*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='datatypesForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theTable' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='decodeDataFromBase64:' class_method='true'>
-<arg index='0' name='theEncodedData' declared_type='NSString*' type='@'/>
-<retval declared_type='NSData*' type='@'/>
+<arg index='0' type='@' name='theEncodedData' declared_type='NSString*'/>
+<retval type='@' declared_type='NSData*'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='dictionaryDescription'>
-<retval declared_type='NSFOrderedDictionary*' type='@'/>
+<retval type='@' declared_type='NSFOrderedDictionary*'/>
 </method>
 <method selector='dropIndex:'>
-<arg index='0' name='theIndex' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theIndex' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='dropTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theTable' declared_type='NSString*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='encodeDataToBase64:' class_method='true'>
-<arg index='0' name='theData' declared_type='NSData*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='theData' declared_type='NSData*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='encoding'>
-<retval declared_type='NSFEncodingType' type='i'/>
+<retval type='i' declared_type='NSFEncodingType'/>
 </method>
 <method selector='executeSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoResult*' type='@'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoResult*'/>
 </method>
 <method selector='indexedColumnsForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theTable' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='indexes'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='initWithPath:'>
-<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='thePath' declared_type='NSString*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='integrityCheck'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='isDatabaseOpen'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='isTransactionActive'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='journalModeAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='NSFJournalModeMode' type='i'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='i' declared_type='NSFJournalModeMode'/>
 </method>
 <method selector='maxRowUIDForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
-<retval declared_type='long long' type='q'/>
+<arg index='0' type='@' name='theTable' declared_type='NSString*'/>
+<retval type='q' declared_type='long long'/>
 </method>
 <method selector='nanoStoreEngineVersion' class_method='true'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='openWithCacheMethod:useFastMode:'>
-<arg index='0' name='theCacheMethod' declared_type='NSFCacheMethod' type='i'/>
-<arg index='1' name='useFastMode' declared_type='BOOL' type='B'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='i' name='theCacheMethod' declared_type='NSFCacheMethod'/>
+<arg index='1' type='B' name='useFastMode' declared_type='BOOL'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='pageSize'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='path'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='recommendedCacheSize' class_method='true'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='rollbackTransaction'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='setBusyTimeout:'>
-<arg index='0' name='theTimeout' declared_type='unsigned int' type='I'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='I' name='theTimeout' declared_type='unsigned int'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setCacheMethod:'>
-<arg index='0' name='cacheMethod' declared_type='NSFCacheMethod' type='i'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='i' name='cacheMethod' declared_type='NSFCacheMethod'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setCacheSize:'>
-<arg index='0' name='numberOfPages' declared_type='NSUInteger' type='I'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='I' name='numberOfPages' declared_type='NSUInteger'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='setEncodingType:'>
-<arg index='0' name='theEncodingType' declared_type='NSFEncodingType' type='i'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='i' name='theEncodingType' declared_type='NSFEncodingType'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='setJournalMode:'>
-<arg index='0' name='theMode' declared_type='NSFJournalModeMode' type='i'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='i' name='theMode' declared_type='NSFJournalModeMode'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='setPageSize:'>
-<arg index='0' name='numberOfBytes' declared_type='NSUInteger' type='I'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='I' name='numberOfBytes' declared_type='NSUInteger'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='setSynchronousMode:'>
-<arg index='0' name='theSynchronousMode' declared_type='NSFSynchronousMode' type='i'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='i' name='theSynchronousMode' declared_type='NSFSynchronousMode'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setTempStoreMode:'>
-<arg index='0' name='theTempStoreMode' declared_type='NSFTempStoreMode' type='i'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='i' name='theTempStoreMode' declared_type='NSFTempStoreMode'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='sharedNanoStoreEngineDatatypes' class_method='true'>
-<retval declared_type='NSSet*' type='@'/>
+<retval type='@' declared_type='NSSet*'/>
 </method>
 <method selector='sqlite'>
-<retval declared_type='sqlite3*' type='^{sqlite3=}'/>
+<retval type='^{sqlite3=}' declared_type='sqlite3*'/>
 </method>
 <method selector='sqliteVersion' class_method='true'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='stringWithUUID' class_method='true'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='synchronousMode'>
-<retval declared_type='NSFSynchronousMode' type='i'/>
+<retval type='i' declared_type='NSFSynchronousMode'/>
 </method>
 <method selector='systemPageSize' class_method='true'>
-<retval declared_type='NSInteger' type='i'/>
+<retval type='i' declared_type='NSInteger'/>
 </method>
 <method selector='tables'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='tempStoreMode'>
-<retval declared_type='NSFTempStoreMode' type='i'/>
+<retval type='i' declared_type='NSFTempStoreMode'/>
 </method>
 <method selector='temporaryTables'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 </class>
 <class name='NSFNanoExpression'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='addPredicate:withOperator:'>
-<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
-<arg index='1' name='theOperator' declared_type='NSFOperator' type='i'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='thePredicate' declared_type='NSFNanoPredicate*'/>
+<arg index='1' type='i' name='theOperator' declared_type='NSFOperator'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='arrayDescription'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='expressionWithPredicate:' class_method='true'>
-<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
-<retval declared_type='NSFNanoExpression*' type='@'/>
+<arg index='0' type='@' name='thePredicate' declared_type='NSFNanoPredicate*'/>
+<retval type='@' declared_type='NSFNanoExpression*'/>
 </method>
 <method selector='initWithPredicate:'>
-<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='thePredicate' declared_type='NSFNanoPredicate*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='operators'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='predicates'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 </class>
 <class name='NSFNanoObject'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_NSObjectToJSONString:error:' class_method='true'>
-<arg index='0' name='object' declared_type='id' type='@'/>
-<arg index='1' name='error' declared_type='NSError**' type='^@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='object' declared_type='id'/>
+<arg index='1' type='^@' name='error' declared_type='NSError**'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_safeArrayFromArray:' class_method='true'>
-<arg index='0' name='array' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='array' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='_safeDictionaryFromDictionary:' class_method='true'>
-<arg index='0' name='dictionary' declared_type='NSDictionary*' type='@'/>
-<retval declared_type='NSDictionary*' type='@'/>
+<arg index='0' type='@' name='dictionary' declared_type='NSDictionary*'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='_safeObjectFromObject:' class_method='true'>
-<arg index='0' name='object' declared_type='id' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='object' declared_type='id'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='_setOriginalClassString:'>
-<arg index='0' name='theClassString' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='theClassString' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='addEntriesFromDictionary:'>
-<arg index='0' name='otherDictionary' declared_type='NSDictionary*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='otherDictionary' declared_type='NSDictionary*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='dictionaryRepresentation'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='info'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='initFromDictionaryRepresentation:'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theDictionary' declared_type='NSDictionary*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='initFromDictionaryRepresentation:key:'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='theKey' declared_type='NSString*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theDictionary' declared_type='NSDictionary*'/>
+<arg index='1' type='@' name='theKey' declared_type='NSString*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='isEqualToNanoObject:'>
-<arg index='0' name='otherNanoObject' declared_type='NSFNanoObject*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='otherNanoObject' declared_type='NSFNanoObject*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='key'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='nanoObject' class_method='true'>
-<retval declared_type='NSFNanoObject*' type='@'/>
+<retval type='@' declared_type='NSFNanoObject*'/>
 </method>
 <method selector='nanoObjectWithDictionary:' class_method='true'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
-<retval declared_type='NSFNanoObject*' type='@'/>
+<arg index='0' type='@' name='theDictionary' declared_type='NSDictionary*'/>
+<retval type='@' declared_type='NSFNanoObject*'/>
 </method>
 <method selector='nanoObjectWithDictionary:key:' class_method='true'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='theKey' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoObject*' type='@'/>
+<arg index='0' type='@' name='theDictionary' declared_type='NSDictionary*'/>
+<arg index='1' type='@' name='theKey' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoObject*'/>
 </method>
 <method selector='objectForKey:'>
-<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='aKey' declared_type='NSString*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='originalClassString'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='removeAllObjects'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='removeObjectForKey:'>
-<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='aKey' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='removeObjectsForKeys:'>
-<arg index='0' name='keyArray' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='keyArray' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='saveStoreAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='setObject:forKey:'>
-<arg index='0' name='anObject' declared_type='id' type='@'/>
-<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='anObject' declared_type='id'/>
+<arg index='1' type='@' name='aKey' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setStore:'>
-<arg index='0' name='store' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='store' declared_type='NSFNanoStore*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='store'>
-<retval declared_type='NSFNanoStore*' type='@'/>
+<retval type='@' declared_type='NSFNanoStore*'/>
 </method>
 </class>
 <class name='NSFNanoPredicate'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='column'>
-<retval declared_type='NSFTableColumnType' type='i'/>
+<retval type='i' declared_type='NSFTableColumnType'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='initWithColumn:matching:value:'>
-<arg index='0' name='theType' declared_type='NSFTableColumnType' type='i'/>
-<arg index='1' name='theMatch' declared_type='NSFMatchType' type='i'/>
-<arg index='2' name='theValue' declared_type='id' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='i' name='theType' declared_type='NSFTableColumnType'/>
+<arg index='1' type='i' name='theMatch' declared_type='NSFMatchType'/>
+<arg index='2' type='@' name='theValue' declared_type='NSString*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='match'>
-<retval declared_type='NSFMatchType' type='i'/>
+<retval type='i' declared_type='NSFMatchType'/>
 </method>
 <method selector='predicateWithColumn:matching:value:' class_method='true'>
-<arg index='0' name='theType' declared_type='NSFTableColumnType' type='i'/>
-<arg index='1' name='theMatch' declared_type='NSFMatchType' type='i'/>
-<arg index='2' name='theValue' declared_type='id' type='@'/>
-<retval declared_type='NSFNanoPredicate*' type='@'/>
+<arg index='0' type='i' name='theType' declared_type='NSFTableColumnType'/>
+<arg index='1' type='i' name='theMatch' declared_type='NSFMatchType'/>
+<arg index='2' type='@' name='theValue' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoPredicate*'/>
 </method>
 <method selector='value'>
-<retval declared_type='id' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 </class>
 <class name='NSFNanoResult'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_calculateNumberOfRows'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_initWithDictionary:'>
-<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='results' declared_type='NSDictionary*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='_initWithError:'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='error' declared_type='NSError*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='_reset'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_resultWithDictionary:' class_method='true'>
-<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
-<retval declared_type='NSFNanoResult*' type='@'/>
+<arg index='0' type='@' name='results' declared_type='NSDictionary*'/>
+<retval type='@' declared_type='NSFNanoResult*'/>
 </method>
 <method selector='_resultWithError:' class_method='true'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
-<retval declared_type='NSFNanoResult*' type='@'/>
+<arg index='0' type='@' name='error' declared_type='NSError*'/>
+<retval type='@' declared_type='NSFNanoResult*'/>
 </method>
 <method selector='_setError:'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='error' declared_type='NSError*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='columns'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='error'>
-<retval declared_type='NSError*' type='@'/>
+<retval type='@' declared_type='NSError*'/>
 </method>
 <method selector='firstValue'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='numberOfRows'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='setError:'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='error' declared_type='NSError*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='valueAtIndex:forColumn:'>
-<arg index='0' name='theIndex' declared_type='NSUInteger' type='I'/>
-<arg index='1' name='theColumn' declared_type='NSString*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='I' name='theIndex' declared_type='NSUInteger'/>
+<arg index='1' type='@' name='theColumn' declared_type='NSString*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='valuesForColumn:'>
-<arg index='0' name='theColumn' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theColumn' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='writeToFile:'>
-<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='thePath' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 </class>
 <class name='NSFNanoSearch'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_dataWithKey:attribute:value:matching:'>
-<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
-<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
-<arg index='2' name='aValue' declared_type='NSString*' type='@'/>
-<arg index='3' name='match' declared_type='NSFMatchType' type='i'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='aKey' declared_type='NSString*'/>
+<arg index='1' type='@' name='anAttribute' declared_type='NSString*'/>
+<arg index='2' type='@' name='aValue' declared_type='NSString*'/>
+<arg index='3' type='i' name='match' declared_type='NSFMatchType'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='_dataWithKey:attribute:value:matching:returning:'>
-<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
-<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
-<arg index='2' name='aValue' declared_type='NSString*' type='@'/>
-<arg index='3' name='match' declared_type='NSFMatchType' type='i'/>
-<arg index='4' name='returnedObjectType' declared_type='NSFReturnType' type='i'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='aKey' declared_type='NSString*'/>
+<arg index='1' type='@' name='anAttribute' declared_type='NSString*'/>
+<arg index='2' type='@' name='aValue' declared_type='NSString*'/>
+<arg index='3' type='i' name='match' declared_type='NSFMatchType'/>
+<arg index='4' type='i' name='returnedObjectType' declared_type='NSFReturnType'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='_dictionaryForKeyPath:value:'>
-<arg index='0' name='keyPath' declared_type='NSString*' type='@'/>
-<arg index='1' name='value' declared_type='id' type='@'/>
-<retval declared_type='NSDictionary*' type='@'/>
+<arg index='0' type='@' name='keyPath' declared_type='NSString*'/>
+<arg index='1' type='@' name='value' declared_type='id'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='_prepareSQLQueryStringWithExpressions:'>
-<arg index='0' name='someExpressions' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='someExpressions' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_prepareSQLQueryStringWithKey:attribute:value:matching:'>
-<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
-<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
-<arg index='2' name='aValue' declared_type='id' type='@'/>
-<arg index='3' name='match' declared_type='NSFMatchType' type='i'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='aKey' declared_type='NSString*'/>
+<arg index='1' type='@' name='anAttribute' declared_type='NSString*'/>
+<arg index='2' type='@' name='aValue' declared_type='id'/>
+<arg index='3' type='i' name='match' declared_type='NSFMatchType'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_prepareSQLQueryStringWithKeys:' class_method='true'>
-<arg index='0' name='someKeys' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='someKeys' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_preparedSQL'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_querySegmentForAttributeColumnWithValue:matching:valueColumnWithValue:' class_method='true'>
-<arg index='0' name='anAttributeValue' declared_type='id' type='@'/>
-<arg index='1' name='match' declared_type='NSFMatchType' type='i'/>
-<arg index='2' name='aValue' declared_type='id' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='anAttributeValue' declared_type='id'/>
+<arg index='1' type='i' name='match' declared_type='NSFMatchType'/>
+<arg index='2' type='@' name='aValue' declared_type='id'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_querySegmentForColumn:value:matching:' class_method='true'>
-<arg index='0' name='aColumn' declared_type='NSString*' type='@'/>
-<arg index='1' name='aValue' declared_type='id' type='@'/>
-<arg index='2' name='match' declared_type='NSFMatchType' type='i'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='aColumn' declared_type='NSString*'/>
+<arg index='1' type='@' name='aValue' declared_type='id'/>
+<arg index='2' type='i' name='match' declared_type='NSFMatchType'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_quoteStrings:joiningWithDelimiter:' class_method='true'>
-<arg index='0' name='strings' declared_type='NSArray*' type='@'/>
-<arg index='1' name='delimiter' declared_type='NSString*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='strings' declared_type='NSArray*'/>
+<arg index='1' type='@' name='delimiter' declared_type='NSString*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_resultsFromSQLQuery:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='_retrieveDataAdded:calendarDate:error:'>
-<arg index='0' name='aDateMatch' declared_type='NSFDateMatchType' type='i'/>
-<arg index='1' name='aDate' declared_type='NSDate*' type='@'/>
-<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='NSDictionary*' type='@'/>
+<arg index='0' type='i' name='aDateMatch' declared_type='NSFDateMatchType'/>
+<arg index='1' type='@' name='aDate' declared_type='NSDate*'/>
+<arg index='2' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='_retrieveDataWithError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='NSDictionary*' type='@'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='_sortResultsIfApplicable:returnType:'>
-<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='theReturnType' declared_type='NSFReturnType' type='i'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='results' declared_type='NSDictionary*'/>
+<arg index='1' type='i' name='theReturnType' declared_type='NSFReturnType'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='aggregateOperation:onAttribute:'>
-<arg index='0' name='theFunctionType' declared_type='NSFAggregateFunctionType' type='i'/>
-<arg index='1' name='theAttribute' declared_type='NSString*' type='@'/>
-<retval declared_type='NSNumber*' type='@'/>
+<arg index='0' type='i' name='theFunctionType' declared_type='NSFAggregateFunctionType'/>
+<arg index='1' type='@' name='theAttribute' declared_type='NSString*'/>
+<retval type='@' declared_type='NSNumber*'/>
 </method>
 <method selector='attribute'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='attributesToBeReturned'>
-<retval declared_type='NSArray*' type='@'/>
-</method>
-<method selector='bag'>
-<retval declared_type='NSFNanoBag*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='executeSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoResult*' type='@'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoResult*'/>
 </method>
 <method selector='executeSQL:returnType:error:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
-<arg index='1' name='theReturnType' declared_type='NSFReturnType' type='i'/>
-<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSString*'/>
+<arg index='1' type='i' name='theReturnType' declared_type='NSFReturnType'/>
+<arg index='2' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='explainSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoResult*' type='@'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoResult*'/>
 </method>
 <method selector='expressions'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='filterClass'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='groupValues'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='initWithStore:'>
-<arg index='0' name='theNanoStore' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theNanoStore' declared_type='NSFNanoStore*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='key'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='limit'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='match'>
-<retval declared_type='NSFMatchType' type='i'/>
+<retval type='i' declared_type='NSFMatchType'/>
 </method>
 <method selector='nanoStore'>
-<retval declared_type='NSFNanoStore*' type='@'/>
+<retval type='@' declared_type='NSFNanoStore*'/>
 </method>
 <method selector='offset'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='reset'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='searchObjectsAdded:date:returnType:error:'>
-<arg index='0' name='theDateMatch' declared_type='NSFDateMatchType' type='i'/>
-<arg index='1' name='theDate' declared_type='NSDate*' type='@'/>
-<arg index='2' name='theReturnType' declared_type='NSFReturnType' type='i'/>
-<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='i' name='theDateMatch' declared_type='NSFDateMatchType'/>
+<arg index='1' type='@' name='theDate' declared_type='NSDate*'/>
+<arg index='2' type='i' name='theReturnType' declared_type='NSFReturnType'/>
+<arg index='3' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='searchObjectsWithReturnType:error:'>
-<arg index='0' name='theReturnType' declared_type='NSFReturnType' type='i'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='i' name='theReturnType' declared_type='NSFReturnType'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='searchWithStore:' class_method='true'>
-<arg index='0' name='theNanoStore' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='NSFNanoSearch*' type='@'/>
+<arg index='0' type='@' name='theNanoStore' declared_type='NSFNanoStore*'/>
+<retval type='@' declared_type='NSFNanoSearch*'/>
 </method>
 <method selector='setAttribute:'>
-<arg index='0' name='attribute' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='attribute' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setAttributesToBeReturned:'>
-<arg index='0' name='attributesToBeReturned' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
-</method>
-<method selector='setBag:'>
-<arg index='0' name='bag' declared_type='NSFNanoBag*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='attributesToBeReturned' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setExpressions:'>
-<arg index='0' name='expressions' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='expressions' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setFilterClass:'>
-<arg index='0' name='filterClass' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='filterClass' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setGroupValues:'>
-<arg index='0' name='groupValues' declared_type='BOOL' type='B'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='B' name='groupValues' declared_type='BOOL'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setKey:'>
-<arg index='0' name='key' declared_type='NSString*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='key' declared_type='NSString*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setLimit:'>
-<arg index='0' name='limit' declared_type='NSUInteger' type='I'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='I' name='limit' declared_type='NSUInteger'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setMatch:'>
-<arg index='0' name='match' declared_type='NSFMatchType' type='i'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='i' name='match' declared_type='NSFMatchType'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setNanoStore:'>
-<arg index='0' name='nanoStore' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='nanoStore' declared_type='NSFNanoStore*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setOffset:'>
-<arg index='0' name='offset' declared_type='NSUInteger' type='I'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='I' name='offset' declared_type='NSUInteger'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setSort:'>
-<arg index='0' name='sort' declared_type='NSArray*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='sort' declared_type='NSArray*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setValue:'>
-<arg index='0' name='value' declared_type='id' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='value' declared_type='id'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='sort'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='sql'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='value'>
-<retval declared_type='id' type='@'/>
+<retval type='@' declared_type='id'/>
 </method>
 </class>
 <class name='NSFNanoSortDescriptor'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='attribute'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='initWithAttribute:ascending:'>
-<arg index='0' name='theAttribute' declared_type='NSString*' type='@'/>
-<arg index='1' name='ascending' declared_type='BOOL' type='B'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theAttribute' declared_type='NSString*'/>
+<arg index='1' type='B' name='ascending' declared_type='BOOL'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='isAscending'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='sortDescriptorWithAttribute:ascending:' class_method='true'>
-<arg index='0' name='theAttribute' declared_type='NSString*' type='@'/>
-<arg index='1' name='ascending' declared_type='BOOL' type='B'/>
-<retval declared_type='NSFNanoSortDescriptor*' type='@'/>
+<arg index='0' type='@' name='theAttribute' declared_type='NSString*'/>
+<arg index='1' type='B' name='ascending' declared_type='BOOL'/>
+<retval type='@' declared_type='NSFNanoSortDescriptor*'/>
 </method>
 </class>
 <class name='NSFNanoStore'>
 <method selector='JSONDescription'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_NSFDatatypeOfObject:'>
-<arg index='0' name='value' declared_type='id' type='@'/>
-<retval declared_type='NSFNanoDatatype' type='i'/>
+<arg index='0' type='@' name='value' declared_type='id'/>
+<retval type='i' declared_type='NSFNanoDatatype'/>
 </method>
 <method selector='__storeDictionaries:forKeys:error:'>
-<arg index='0' name='someObjects' declared_type='NSArray*' type='@'/>
-<arg index='1' name='someKeys' declared_type='NSArray*' type='@'/>
-<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='someObjects' declared_type='NSArray*'/>
+<arg index='1' type='@' name='someKeys' declared_type='NSArray*'/>
+<arg index='2' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_addObjectsFromArray:forceSave:error:'>
-<arg index='0' name='someObjects' declared_type='NSArray*' type='@'/>
-<arg index='1' name='forceSave' declared_type='BOOL' type='B'/>
-<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='someObjects' declared_type='NSArray*'/>
+<arg index='1' type='B' name='forceSave' declared_type='BOOL'/>
+<arg index='2' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_backupFileStoreToDirectoryAtPath:extension:compact:error:'>
-<arg index='0' name='aPath' declared_type='NSString*' type='@'/>
-<arg index='1' name='anExtension' declared_type='NSString*' type='@'/>
-<arg index='2' name='flag' declared_type='BOOL' type='B'/>
-<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='aPath' declared_type='NSString*'/>
+<arg index='1' type='@' name='anExtension' declared_type='NSString*'/>
+<arg index='2' type='B' name='flag' declared_type='BOOL'/>
+<arg index='3' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_backupMemoryStoreToDirectoryAtPath:extension:compact:error:'>
-<arg index='0' name='aPath' declared_type='NSString*' type='@'/>
-<arg index='1' name='anExtension' declared_type='NSString*' type='@'/>
-<arg index='2' name='flag' declared_type='BOOL' type='B'/>
-<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='aPath' declared_type='NSString*'/>
+<arg index='1' type='@' name='anExtension' declared_type='NSString*'/>
+<arg index='2' type='B' name='flag' declared_type='BOOL'/>
+<arg index='3' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_bindValue:forAttribute:parameterNumber:usingSQLite3Statement:'>
-<arg index='0' name='aValue' declared_type='id' type='@'/>
-<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
-<arg index='2' name='aParamNumber' declared_type='NSInteger' type='i'/>
-<arg index='3' name='aStatement' declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='aValue' declared_type='id'/>
+<arg index='1' type='@' name='anAttribute' declared_type='NSString*'/>
+<arg index='2' type='i' name='aParamNumber' declared_type='NSInteger'/>
+<arg index='3' type='^{sqlite3_stmt=}' name='aStatement' declared_type='sqlite3_stmt*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_calendarDateToString:' class_method='true'>
-<arg index='0' name='aDate' declared_type='NSDate*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='aDate' declared_type='NSDate*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_checkNanoStoreIsReadyAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_createAndOpenDebugDatabase' class_method='true'>
-<retval declared_type='NSFNanoStore*' type='@'/>
+<retval type='@' declared_type='NSFNanoStore*'/>
 </method>
 <method selector='_defaultTestData' class_method='true'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='_executeSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoResult*' type='@'/>
+<arg index='0' type='@' name='theSQLStatement' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoResult*'/>
 </method>
 <method selector='_executeSQLite3StepUsingSQLite3Statement:'>
-<arg index='0' name='aStatement' declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='^{sqlite3_stmt=}' name='aStatement' declared_type='sqlite3_stmt*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_flattenCollection:keyPath:keys:values:'>
-<arg index='0' name='someObject' declared_type='id' type='@'/>
-<arg index='1' name='aKeyPath' declared_type='NSMutableArray**' type='^@'/>
-<arg index='2' name='someKeys' declared_type='NSMutableArray**' type='^@'/>
-<arg index='3' name='someValues' declared_type='NSMutableArray**' type='^@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='someObject' declared_type='id'/>
+<arg index='1' type='^@' name='aKeyPath' declared_type='NSMutableArray**'/>
+<arg index='2' type='^@' name='someKeys' declared_type='NSMutableArray**'/>
+<arg index='3' type='^@' name='someValues' declared_type='NSMutableArray**'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_flattenCollection:keys:values:'>
-<arg index='0' name='info' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='flattenedKeys' declared_type='NSMutableArray**' type='^@'/>
-<arg index='2' name='flattenedValues' declared_type='NSMutableArray**' type='^@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='info' declared_type='NSDictionary*'/>
+<arg index='1' type='^@' name='flattenedKeys' declared_type='NSMutableArray**'/>
+<arg index='2' type='^@' name='flattenedValues' declared_type='NSMutableArray**'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_initializePreparedStatementsWithError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_isOurTransaction'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_nestedDescriptionWithPrefixedSpace:'>
-<arg index='0' name='prefixedSpace' declared_type='NSString*' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='prefixedSpace' declared_type='NSString*'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='_prepareSQLite3Statement:theSQLStatement:'>
-<arg index='0' name='aStatement' declared_type='sqlite3_stmt**' type='^^{sqlite3_stmt}'/>
-<arg index='1' name='aSQLQuery' declared_type='NSString*' type='@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^^{sqlite3_stmt}' name='aStatement' declared_type='sqlite3_stmt**'/>
+<arg index='1' type='@' name='aSQLQuery' declared_type='NSString*'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_releasePreparedStatements'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_setIsOurTransaction:'>
-<arg index='0' name='value' declared_type='BOOL' type='B'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='B' name='value' declared_type='BOOL'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='_setupCachingSchema'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_storeDictionary:forKey:forClassNamed:error:'>
-<arg index='0' name='someInfo' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
-<arg index='2' name='classType' declared_type='NSString*' type='@'/>
-<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='someInfo' declared_type='NSDictionary*'/>
+<arg index='1' type='@' name='aKey' declared_type='NSString*'/>
+<arg index='2' type='@' name='classType' declared_type='NSString*'/>
+<arg index='3' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='_stringFromValue:'>
-<arg index='0' name='aValue' declared_type='id' type='@'/>
-<retval declared_type='NSString*' type='@'/>
+<arg index='0' type='@' name='aValue' declared_type='id'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='addObject:error:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theObject' declared_type='id'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='addObjectsFromArray:error:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theObjects' declared_type='NSArray*'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='allObjectClasses'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='bagWithName:'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoBag*' type='@'/>
+<arg index='0' type='@' name='theName' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoBag*'/>
 </method>
 <method selector='bags'>
-<retval declared_type='NSArray*' type='@'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='bagsContainingObjectWithKey:'>
-<arg index='0' name='theKey' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theKey' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='bagsWithKeysInArray:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theKeys' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='bagsWithName:'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theName' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='beginTransactionAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='clearIndexesAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='closeWithError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='commitTransactionAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='compactStoreAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='countOfObjectsOfClassNamed:'>
-<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
-<retval declared_type='long long' type='q'/>
+<arg index='0' type='@' name='theClassName' declared_type='NSString*'/>
+<retval type='q' declared_type='long long'/>
 </method>
 <method selector='createAndOpenStoreWithType:path:error:' class_method='true'>
-<arg index='0' name='theType' declared_type='NSFNanoStoreType' type='i'/>
-<arg index='1' name='thePath' declared_type='NSString*' type='@'/>
-<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='NSFNanoStore*' type='@'/>
+<arg index='0' type='i' name='theType' declared_type='NSFNanoStoreType'/>
+<arg index='1' type='@' name='thePath' declared_type='NSString*'/>
+<arg index='2' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='@' declared_type='NSFNanoStore*'/>
 </method>
 <method selector='createStoreWithType:path:' class_method='true'>
-<arg index='0' name='theType' declared_type='NSFNanoStoreType' type='i'/>
-<arg index='1' name='thePath' declared_type='NSString*' type='@'/>
-<retval declared_type='NSFNanoStore*' type='@'/>
+<arg index='0' type='i' name='theType' declared_type='NSFNanoStoreType'/>
+<arg index='1' type='@' name='thePath' declared_type='NSString*'/>
+<retval type='@' declared_type='NSFNanoStore*'/>
 </method>
 <method selector='description'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='dictionaryDescription'>
-<retval declared_type='NSFOrderedDictionary*' type='@'/>
+<retval type='@' declared_type='NSFOrderedDictionary*'/>
 </method>
 <method selector='discardUnsavedChanges'>
-<retval declared_type='void' type='v'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='filePath'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='hasUnsavedChanges'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='initStoreWithType:path:'>
-<arg index='0' name='theType' declared_type='NSFNanoStoreType' type='i'/>
-<arg index='1' name='thePath' declared_type='NSString*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='i' name='theType' declared_type='NSFNanoStoreType'/>
+<arg index='1' type='@' name='thePath' declared_type='NSString*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='isClosed'>
-<retval declared_type='BOOL' type='B'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='nanoEngineProcessingMode'>
-<retval declared_type='NSFEngineProcessingMode' type='i'/>
+<retval type='i' declared_type='NSFEngineProcessingMode'/>
 </method>
 <method selector='nanoStoreEngine'>
-<retval declared_type='NSFNanoEngine*' type='@'/>
+<retval type='@' declared_type='NSFNanoEngine*'/>
 </method>
 <method selector='objectsOfClassNamed:'>
-<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theClassName' declared_type='NSString*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='objectsOfClassNamed:usingSortDescriptors:'>
-<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
-<arg index='1' name='theSortDescriptors' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theClassName' declared_type='NSString*'/>
+<arg index='1' type='@' name='theSortDescriptors' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='objectsWithKeysInArray:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
-<retval declared_type='NSArray*' type='@'/>
+<arg index='0' type='@' name='theKeys' declared_type='NSArray*'/>
+<retval type='@' declared_type='NSArray*'/>
 </method>
 <method selector='openWithError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='rebuildIndexesAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='removeAllObjectsFromStoreAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='removeObject:error:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theObject' declared_type='id'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='removeObjectsInArray:error:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theObjects' declared_type='NSArray*'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='removeObjectsWithKeysInArray:error:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
-<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='theKeys' declared_type='NSArray*'/>
+<arg index='1' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='rollbackTransactionAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='saveInterval'>
-<retval declared_type='NSUInteger' type='I'/>
+<retval type='I' declared_type='NSUInteger'/>
 </method>
 <method selector='saveStoreAndReturnError:'>
-<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='saveStoreToDirectoryAtPath:compactDatabase:error:'>
-<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
-<arg index='1' name='shouldCompact' declared_type='BOOL' type='B'/>
-<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
-<retval declared_type='BOOL' type='B'/>
+<arg index='0' type='@' name='thePath' declared_type='NSString*'/>
+<arg index='1' type='B' name='shouldCompact' declared_type='BOOL'/>
+<arg index='2' type='^@' type_modifier='o' name='outError' declared_type='NSError**'/>
+<retval type='B' declared_type='BOOL'/>
 </method>
 <method selector='setNanoEngineProcessingMode:'>
-<arg index='0' name='nanoEngineProcessingMode' declared_type='NSFEngineProcessingMode' type='i'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='i' name='nanoEngineProcessingMode' declared_type='NSFEngineProcessingMode'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setNanoStoreEngine:'>
-<arg index='0' name='nanoStoreEngine' declared_type='NSFNanoEngine*' type='@'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='nanoStoreEngine' declared_type='NSFNanoEngine*'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='setSaveInterval:'>
-<arg index='0' name='saveInterval' declared_type='NSUInteger' type='I'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='I' name='saveInterval' declared_type='NSUInteger'/>
+<retval type='v' declared_type='void'/>
 </method>
 </class>
 <class name='NSFOrderedDictionary'>
 <method selector='insertObject:forKey:atIndex:'>
-<arg index='0' name='anObject' declared_type='id' type='@'/>
-<arg index='1' name='aKey' declared_type='id' type='@'/>
-<arg index='2' name='anIndex' declared_type='NSUInteger' type='I'/>
-<retval declared_type='void' type='v'/>
+<arg index='0' type='@' name='anObject' declared_type='id'/>
+<arg index='1' type='@' name='aKey' declared_type='id'/>
+<arg index='2' type='I' name='anIndex' declared_type='NSUInteger'/>
+<retval type='v' declared_type='void'/>
 </method>
 <method selector='keyAtIndex:'>
-<arg index='0' name='anIndex' declared_type='NSUInteger' type='I'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='I' name='anIndex' declared_type='NSUInteger'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='reverseKeyEnumerator'>
-<retval declared_type='NSEnumerator*' type='@'/>
+<retval type='@' declared_type='NSEnumerator*'/>
 </method>
 </class>
 <class name='NSObject'>
 <method selector='initNanoObjectFromDictionaryRepresentation:forKey:store:'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
-<arg index='2' name='theStore' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theDictionary' declared_type='NSDictionary*'/>
+<arg index='1' type='@' name='aKey' declared_type='NSString*'/>
+<arg index='2' type='@' name='theStore' declared_type='NSFNanoStore*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='nanoObjectDictionaryRepresentation'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='nanoObjectKey'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='rootObject'>
-<retval declared_type='id' type='@'/>
+<retval type='@' declared_type='id'/>
 </method>
 </class>
 <informal_protocol name='NSFNanoObjectProtocol'>
 <method selector='initNanoObjectFromDictionaryRepresentation:forKey:store:' type='@20@0:4@8@12@16'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
-<arg index='2' name='theStore' declared_type='NSFNanoStore*' type='@'/>
-<retval declared_type='id' type='@'/>
+<arg index='0' type='@' name='theDictionary' declared_type='NSDictionary*'/>
+<arg index='1' type='@' name='aKey' declared_type='NSString*'/>
+<arg index='2' type='@' name='theStore' declared_type='NSFNanoStore*'/>
+<retval type='@' declared_type='id'/>
 </method>
 <method selector='nanoObjectDictionaryRepresentation' type='@8@0:4'>
-<retval declared_type='NSDictionary*' type='@'/>
+<retval type='@' declared_type='NSDictionary*'/>
 </method>
 <method selector='nanoObjectKey' type='@8@0:4'>
-<retval declared_type='NSString*' type='@'/>
+<retval type='@' declared_type='NSString*'/>
 </method>
 <method selector='rootObject' type='@8@0:4'>
-<retval declared_type='id' type='@'/>
+<retval type='@' declared_type='id'/>
 </method>
 </informal_protocol>
 </signatures>