diff --git a/README.md b/README.md
index 5b2cb5a..586e7de 100644
--- a/README.md
+++ b/README.md
@@ -27,9 +27,9 @@ require 'nano-store'
 Motion::Project::App.setup do |app|
   app.name = 'myapp'
   
-  # Only needed if you have not already specifying a pods dependency
+  # Add the pod NanoStore to your project
   app.pods do
-    pod 'NanoStore', '~> 2.1.4'
+    pod 'NanoStore', '~> 2.1.8'
   end
 end
 ```
diff --git a/Rakefile b/Rakefile
index 906cfaa..528fcf1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ Motion::Project::App.setup do |app|
   app.redgreen_style = :full
   app.files += Dir.glob(File.join(app.project_dir, 'lib/nano_store/*.rb'))
   app.pods do
-    pod 'NanoStore', '~> 2.1.5'
+    pod 'NanoStore', '~> 2.1.8'
   end
 end
 
diff --git a/lib/nano_store.rb b/lib/nano_store.rb
index 550b84e..f4cbf38 100644
--- a/lib/nano_store.rb
+++ b/lib/nano_store.rb
@@ -15,5 +15,5 @@
   app.files.unshift(File.join(File.dirname(__FILE__), 'nano_store/finder.rb'))
 
   app.pods ||= Motion::Project::CocoaPods.new(app)
-  app.pods.pod 'NanoStore', '~> 2.1.5'
+  app.pods.pod 'NanoStore', '~> 2.1.8'
 end
\ No newline at end of file
diff --git a/lib/nano_store/nano_store.rb b/lib/nano_store/nano_store.rb
index a868812..f87c93a 100644
--- a/lib/nano_store/nano_store.rb
+++ b/lib/nano_store/nano_store.rb
@@ -6,11 +6,11 @@ def self.store(type=:memory, path=nil)
 
     case type
     when :memory
-      store = NSFNanoStore.createAndOpenStoreWithType(NSFMemoryStoreType, path:nil, error: error_ptr)
+      store = NSFNanoStore.createAndOpenStoreWithType(::NSFMemoryStoreType, path:nil, error: error_ptr)
     when :temporary, :temp
-      store = NSFNanoStore.createAndOpenStoreWithType(NSFTemporaryStoreType, path:nil, error: error_ptr)
+      store = NSFNanoStore.createAndOpenStoreWithType(::NSFTemporaryStoreType, path:nil, error: error_ptr)
     when :persistent, :file
-      store = NSFNanoStore.createAndOpenStoreWithType(NSFPersistentStoreType, path:path, error: error_ptr)
+      store = NSFNanoStore.createAndOpenStoreWithType(::NSFPersistentStoreType, path:path, error: error_ptr)
     else
       raise NanoStoreError.new("unexpected store type (#{type}), must be one of: :memory, :temporary or :persistent")
     end
diff --git a/nano-store.gemspec b/nano-store.gemspec
index c073e39..c404dcb 100644
--- a/nano-store.gemspec
+++ b/nano-store.gemspec
@@ -14,6 +14,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = NanoStore::VERSION
 
-  gem.add_dependency 'motion-cocoapods', '>= 1.2.0'
+  gem.add_dependency 'motion-cocoapods', '>= 1.2.1'
   gem.add_development_dependency 'motion-redgreen'
 end
diff --git a/vendor/Podfile.lock b/vendor/Podfile.lock
index 4657653..f25f846 100644
--- a/vendor/Podfile.lock
+++ b/vendor/Podfile.lock
@@ -1,11 +1,11 @@
 
 PODS:
-- NanoStore (2.1.5)
+- NanoStore (2.1.8)
 
 DEPENDENCIES:
-- NanoStore (~> 2.1.5)
+- NanoStore (~> 2.1.8)
 
 SPEC CHECKSUMS:
-  NanoStore: 440272829dfe13db7f1c68de74fc3562475463fe
+  NanoStore: 648b6b984d4df8ad52a1c0d049ad91b8a12a27d0
 
 COCOAPODS: 0.16.0
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m
index f37e882..43d1874 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m
@@ -80,6 +80,9 @@ - (NSString *)description
             break;
     }
     
+    // Make sure we escape quotes if present and the value is a string
+    value = [value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
+    
     switch (match) {
         case NSFEqualTo:
             [description appendString:[NSString stringWithFormat:@"%@ = '%@'", columnValue, value]];
diff --git a/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m b/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m
index 795cfb6..6d7d967 100644
--- a/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m
+++ b/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m
@@ -507,6 +507,11 @@ - (NSString *)_prepareSQLQueryStringWithKey:(NSString *)aKey attribute:(NSString
     NSMutableString *theSQLStatement = nil;
     NSString *attributes = nil;
     
+    // Make sure we escape quotes if present and the value is a string
+    if (YES == [aValue isKindOfClass:[NSString class]]) {
+        aValue = [aValue stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
+    }
+    
     if (nil != attributesToBeReturned) {
         // Prepare the list of attributes we need to gather. Include NSFKEY as well.
         NSMutableSet *set = [[NSMutableSet alloc]initWithArray:attributesToBeReturned];
diff --git a/vendor/Pods/Pods.bridgesupport b/vendor/Pods/Pods.bridgesupport
index 5df47b4..54a042f 100644
--- a/vendor/Pods/Pods.bridgesupport
+++ b/vendor/Pods/Pods.bridgesupport
@@ -1,151 +1,151 @@
 <?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='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='NSFPlist' 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_NSFPlist' 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='@'/>
-<enum name='CacheAllData' value='1'/>
-<enum name='CacheDataOnDemand' value='2'/>
-<enum name='DoNotCacheData' value='3'/>
-<enum name='JournalModeDelete' value='0'/>
-<enum name='JournalModeMemory' value='3'/>
-<enum name='JournalModeOFF' value='5'/>
-<enum name='JournalModePersist' value='2'/>
-<enum name='JournalModeTruncate' value='1'/>
-<enum name='JournalModeWAL' value='4'/>
-<enum name='NSFAfterDate' value='3'/>
-<enum name='NSFAnd' value='1'/>
-<enum name='NSFAttributeColumn' value='2'/>
-<enum name='NSFAverage' value='1'/>
-<enum name='NSFBeforeDate' value='1'/>
-<enum name='NSFBeginsWith' value='1'/>
-<enum name='NSFContains' value='2'/>
-<enum name='NSFCount' value='2'/>
-<enum name='NSFEncodingUTF16' value='2'/>
-<enum name='NSFEncodingUTF8' value='1'/>
-<enum name='NSFEncodingUnknown' value='3'/>
-<enum name='NSFEndsWith' value='3'/>
-<enum name='NSFEngineProcessingDefaultMode' value='1'/>
-<enum name='NSFEngineProcessingFastMode' value='2'/>
-<enum name='NSFEqualTo' value='0'/>
-<enum name='NSFGreaterThan' value='8'/>
-<enum name='NSFInsensitiveBeginsWith' value='5'/>
-<enum name='NSFInsensitiveContains' value='6'/>
-<enum name='NSFInsensitiveEndsWith' value='7'/>
-<enum name='NSFInsensitiveEqualTo' value='4'/>
-<enum name='NSFKeyColumn' value='1'/>
-<enum name='NSFLessThan' value='9'/>
-<enum name='NSFMax' value='3'/>
-<enum name='NSFMemoryStoreType' value='1'/>
-<enum name='NSFMin' value='4'/>
-<enum name='NSFNanoTypeData' value='1'/>
-<enum name='NSFNanoTypeDate' value='3'/>
-<enum name='NSFNanoTypeNumber' value='4'/>
-<enum name='NSFNanoTypeRowUID' value='0'/>
-<enum name='NSFNanoTypeString' value='2'/>
-<enum name='NSFNanoTypeUnknown' value='-1'/>
-<enum name='NSFOnDate' value='2'/>
-<enum name='NSFOr' value='2'/>
-<enum name='NSFPersistentStoreType' value='3'/>
-<enum name='NSFReturnKeys' value='2'/>
-<enum name='NSFReturnObjects' value='1'/>
-<enum name='NSFTemporaryStoreType' value='2'/>
-<enum name='NSFTotal' value='5'/>
-<enum name='NSFValueColumn' value='3'/>
-<enum name='SynchronousModeFull' value='2'/>
-<enum name='SynchronousModeNormal' value='1'/>
-<enum name='SynchronousModeOff' value='0'/>
-<enum name='TempStoreModeDefault' value='0'/>
-<enum name='TempStoreModeFile' value='1'/>
-<enum name='TempStoreModeMemory' value='2'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFAttribute'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFCalendarDate'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFDatatype'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFDomainKey'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFKey'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFKeys'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFMemoryDatabase'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFNanoObjectBehaviorException'/>
+<constant declared_type='NSInteger' type='i' const='true' name='NSFNanoStoreErrorKey'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFNanoStoreUnableToManipulateStoreException'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFNonConformingNanoObjectProtocolException'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFObjectClass'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFP_ColumnIdentifier'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFP_DatatypeIdentifier'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFP_FullDatatypeIdentifier'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFP_SchemaTable'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFP_TableIdentifier'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFPlist'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFRowIDColumnName'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFTemporaryDatabase'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFUnexpectedParameterException'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFValue'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFValues'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSFVersionKey'/>
+<constant declared_type='NSInteger' type='i' const='true' name='NSF_Private_InvalidParameterDataCodeKey'/>
+<constant declared_type='NSInteger' type='i' const='true' name='NSF_Private_MacOSXErrorCodeKey'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFKeys_NSFKey'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFKeys_NSFPlist'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFNanoBag_NSFKey'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFNanoBag_NSFObjectKeys'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFNanoBag_Name'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFValues_NSFAttribute'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFValues_NSFKey'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_NSFValues_NSFValue'/>
+<constant declared_type='NSString*' type='@' const='true' name='NSF_Private_ToDeleteTableKey'/>
+<enum value='1' name='CacheAllData'/>
+<enum value='2' name='CacheDataOnDemand'/>
+<enum value='3' name='DoNotCacheData'/>
+<enum value='0' name='JournalModeDelete'/>
+<enum value='3' name='JournalModeMemory'/>
+<enum value='5' name='JournalModeOFF'/>
+<enum value='2' name='JournalModePersist'/>
+<enum value='1' name='JournalModeTruncate'/>
+<enum value='4' name='JournalModeWAL'/>
+<enum value='3' name='NSFAfterDate'/>
+<enum value='1' name='NSFAnd'/>
+<enum value='2' name='NSFAttributeColumn'/>
+<enum value='1' name='NSFAverage'/>
+<enum value='1' name='NSFBeforeDate'/>
+<enum value='1' name='NSFBeginsWith'/>
+<enum value='2' name='NSFContains'/>
+<enum value='2' name='NSFCount'/>
+<enum value='2' name='NSFEncodingUTF16'/>
+<enum value='1' name='NSFEncodingUTF8'/>
+<enum value='3' name='NSFEncodingUnknown'/>
+<enum value='3' name='NSFEndsWith'/>
+<enum value='1' name='NSFEngineProcessingDefaultMode'/>
+<enum value='2' name='NSFEngineProcessingFastMode'/>
+<enum value='0' name='NSFEqualTo'/>
+<enum value='8' name='NSFGreaterThan'/>
+<enum value='5' name='NSFInsensitiveBeginsWith'/>
+<enum value='6' name='NSFInsensitiveContains'/>
+<enum value='7' name='NSFInsensitiveEndsWith'/>
+<enum value='4' name='NSFInsensitiveEqualTo'/>
+<enum value='1' name='NSFKeyColumn'/>
+<enum value='9' name='NSFLessThan'/>
+<enum value='3' name='NSFMax'/>
+<enum value='1' name='NSFMemoryStoreType'/>
+<enum value='4' name='NSFMin'/>
+<enum value='1' name='NSFNanoTypeData'/>
+<enum value='3' name='NSFNanoTypeDate'/>
+<enum value='4' name='NSFNanoTypeNumber'/>
+<enum value='0' name='NSFNanoTypeRowUID'/>
+<enum value='2' name='NSFNanoTypeString'/>
+<enum value='-1' name='NSFNanoTypeUnknown'/>
+<enum value='2' name='NSFOnDate'/>
+<enum value='2' name='NSFOr'/>
+<enum value='3' name='NSFPersistentStoreType'/>
+<enum value='2' name='NSFReturnKeys'/>
+<enum value='1' name='NSFReturnObjects'/>
+<enum value='2' name='NSFTemporaryStoreType'/>
+<enum value='5' name='NSFTotal'/>
+<enum value='3' name='NSFValueColumn'/>
+<enum value='2' name='SynchronousModeFull'/>
+<enum value='1' name='SynchronousModeNormal'/>
+<enum value='0' name='SynchronousModeOff'/>
+<enum value='0' name='TempStoreModeDefault'/>
+<enum value='1' name='TempStoreModeFile'/>
+<enum value='2' name='TempStoreModeMemory'/>
 <function name='NSFIsDebugOn'>
 <retval declared_type='BOOL' type='B'/>
 </function>
 <function name='NSFNanoDatatypeFromString'>
-<arg name='aNanoDatatype' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='aNanoDatatype'/>
 <retval declared_type='NSFNanoDatatype' type='i'/>
 </function>
 <function name='NSFSetIsDebugOn'>
-<arg name='flag' declared_type='BOOL' type='B'/>
+<arg declared_type='BOOL' type='B' name='flag'/>
 <retval declared_type='void' type='v'/>
 </function>
 <function name='NSFStringFromMatchType'>
-<arg name='aMatchType' declared_type='NSFMatchType' type='i'/>
+<arg declared_type='NSFMatchType' type='i' name='aMatchType'/>
 <retval declared_type='NSString*' type='@'/>
 </function>
 <function name='NSFStringFromNanoDataType'>
-<arg name='aNanoDatatype' declared_type='NSFNanoDatatype' type='i'/>
+<arg declared_type='NSFNanoDatatype' type='i' name='aNanoDatatype'/>
 <retval declared_type='NSString*' type='@'/>
 </function>
 <class name='NSFNanoBag'>
 <method selector='_inflateObjectsWithKeys:'>
-<arg index='0' name='someKeys' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='someKeys' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='_saveInStore:error:'>
-<arg index='0' name='someStore' declared_type='NSFNanoStore*' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSFNanoStore*' type='@' name='someStore' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_setStore:'>
-<arg index='0' name='aStore' declared_type='NSFNanoStore*' type='@'/>
+<arg declared_type='NSFNanoStore*' type='@' name='aStore' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='addObject:error:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='id' type='@' name='theObject' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='addObjectsFromArray:error:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSArray*' type='@' name='theObjects' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
-<method selector='bag' class_method='true'>
+<method class_method='true' selector='bag'>
 <retval declared_type='NSFNanoBag*' type='@'/>
 </method>
-<method selector='bagWithName:' class_method='true'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
+<method class_method='true' selector='bagWithName:'>
+<arg declared_type='NSString*' type='@' name='theName' index='0'/>
 <retval declared_type='id' type='@'/>
 </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='@'/>
+<method class_method='true' selector='bagWithName:andObjects:'>
+<arg declared_type='NSString*' type='@' name='theName' index='0'/>
+<arg declared_type='NSArray*' type='@' name='theObjects' index='1'/>
 <retval declared_type='id' type='@'/>
 </method>
-<method selector='bagWithObjects:' class_method='true'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
+<method class_method='true' selector='bagWithObjects:'>
+<arg declared_type='NSArray*' type='@' name='theObjects' index='0'/>
 <retval declared_type='NSFNanoBag*' type='@'/>
 </method>
 <method selector='count'>
@@ -167,12 +167,12 @@
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='initBagWithName:andObjects:'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
-<arg index='1' name='someObjects' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theName' index='0'/>
+<arg declared_type='NSArray*' type='@' name='someObjects' index='1'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='isEqualToNanoBag:'>
-<arg index='0' name='otherNanoBag' declared_type='NSFNanoBag*' type='@'/>
+<arg declared_type='NSFNanoBag*' type='@' name='otherNanoBag' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='key'>
@@ -182,51 +182,51 @@
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='reloadBagWithError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeAllObjects'>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObject:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
+<arg declared_type='id' type='@' name='theObject' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectWithKey:'>
-<arg index='0' name='theObjectKey' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theObjectKey' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectsInArray:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='theObjects' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectsWithKeysInArray:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='theKeys' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='removedObjects'>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='saveAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='savedObjects'>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='setName:'>
-<arg index='0' name='name' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='name' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setStore:'>
-<arg index='0' name='store' declared_type='NSFNanoStore*' type='@'/>
+<arg declared_type='NSFNanoStore*' type='@' name='store' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='store'>
 <retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 <method selector='undoChangesWithError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='unsavedObjects'>
@@ -234,122 +234,122 @@
 </method>
 </class>
 <class name='NSFNanoEngine'>
-<method selector='NSFEncodingTypeToNSString:' class_method='true'>
-<arg index='0' name='value' declared_type='NSFEncodingType' type='i'/>
+<method class_method='true' selector='NSFEncodingTypeToNSString:'>
+<arg declared_type='NSFEncodingType' type='i' name='value' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_ROWIDPresenceLocation:datatypes:'>
-<arg index='0' name='tableColumns' declared_type='NSArray*' type='@'/>
-<arg index='1' name='datatypes' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='tableColumns' index='0'/>
+<arg declared_type='NSArray*' type='@' name='datatypes' index='1'/>
 <retval declared_type='NSInteger' type='i'/>
 </method>
 <method selector='NSFP_beginTransactionMode:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theSQLStatement' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_cacheMethodToString'>
 <retval declared_type='NSString*' type='@'/>
 </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'/>
+<arg declared_type='NSString*' type='@' name='table' index='0'/>
+<arg declared_type='NSArray*' type='@' name='tableColumns' index='1'/>
+<arg declared_type='NSArray*' type='@' name='tableDatatypes' index='2'/>
+<arg declared_type='BOOL' type='B' name='isTemporaryFlag' index='3'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_datatypeForColumn:'>
-<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='tableAndColumn' index='0'/>
 <retval declared_type='NSFNanoDatatype' type='i'/>
 </method>
 <method selector='NSFP_datatypeForTable:column:'>
-<arg index='0' name='table' declared_type='NSString*' type='@'/>
-<arg index='1' name='column' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='table' index='0'/>
+<arg declared_type='NSString*' type='@' name='column' index='1'/>
 <retval declared_type='NSFNanoDatatype' type='i'/>
 </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='*'/>
+<method class_method='true' selector='NSFP_decodeQuantum:andSource:'>
+<arg declared_type='unsigned char*' type='*' name='dest' index='0'/>
+<arg declared_type='char*' type='*' const='true' name='src' index='1'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_flattenAllTables'>
 <retval declared_type='NSArray*' type='@'/>
 </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='@'/>
+<arg declared_type='NSArray*' type='@' name='values' index='0'/>
+<arg declared_type='NSArray*' type='@' name='columns' index='1'/>
+<arg declared_type='NSString*' type='@' name='table' index='2'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_installCommitCallback'>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_isColumnROWIDAlias:forTable:'>
-<arg index='0' name='column' declared_type='NSString*' type='@'/>
-<arg index='1' name='table' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='column' index='0'/>
+<arg declared_type='NSString*' type='@' name='table' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_nestedDescriptionWithPrefixedSpace:'>
-<arg index='0' name='prefixedSpace' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='prefixedSpace' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_prefixWithDotDelimiter:'>
-<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='tableAndColumn' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </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='@'/>
+<arg declared_type='sqlite3_stmt**' type='^^{sqlite3_stmt}' name='aStatement' index='0'/>
+<arg declared_type='NSString*' type='@' name='aSQLQuery' index='1'/>
 <retval declared_type='NSInteger' type='i'/>
 </method>
 <method selector='NSFP_rebuildDatatypeCache'>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_removeColumn:fromTable:'>
-<arg index='0' name='column' declared_type='NSString*' type='@'/>
-<arg index='1' name='table' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='column' index='0'/>
+<arg declared_type='NSString*' type='@' name='table' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_setFullColumnNamesEnabled'>
 <retval declared_type='void' type='v'/>
 </method>
-<method selector='NSFP_sharedROWIDKeywords' class_method='true'>
+<method class_method='true' selector='NSFP_sharedROWIDKeywords'>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='NSFP_sqlString:appendingTags:'>
-<arg index='0' name='theSQLStatement' declared_type='NSMutableString*' type='@'/>
-<arg index='1' name='columns' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSMutableString*' type='@' name='theSQLStatement' index='0'/>
+<arg declared_type='NSArray*' type='@' name='columns' index='1'/>
 <retval declared_type='void' type='v'/>
 </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'/>
+<arg declared_type='NSMutableString*' type='@' name='theSQLStatement' index='0'/>
+<arg declared_type='NSArray*' type='@' name='tags' index='1'/>
+<arg declared_type='BOOL' type='B' name='flag' index='2'/>
 <retval declared_type='void' type='v'/>
 </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='@'/>
+<arg declared_type='NSMutableString*' type='@' name='theSQLStatement' index='0'/>
+<arg declared_type='NSString*' type='@' name='table' index='1'/>
+<arg declared_type='NSArray*' type='@' name='columns' index='2'/>
+<arg declared_type='NSArray*' type='@' name='datatypes' index='3'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
-<method selector='NSFP_stripBitsFromExtendedResultCode:' class_method='true'>
-<arg index='0' name='extendedResult' declared_type='int' type='i'/>
+<method class_method='true' selector='NSFP_stripBitsFromExtendedResultCode:'>
+<arg declared_type='int' type='i' name='extendedResult' index='0'/>
 <retval declared_type='int' type='i'/>
 </method>
 <method selector='NSFP_suffixWithDotDelimiter:'>
-<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='tableAndColumn' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_uninstallCommitCallback'>
 <retval declared_type='void' type='v'/>
 </method>
-<method selector='NSStringToNSFEncodingType:' class_method='true'>
-<arg index='0' name='value' declared_type='NSString*' type='@'/>
+<method class_method='true' selector='NSStringToNSFEncodingType:'>
+<arg declared_type='NSString*' type='@' name='value' index='0'/>
 <retval declared_type='NSFEncodingType' type='i'/>
 </method>
-<method selector='_plistToDictionary:' class_method='true'>
-<arg index='0' name='aPlist' declared_type='NSString*' type='@'/>
+<method class_method='true' selector='_plistToDictionary:'>
+<arg declared_type='NSString*' type='@' name='aPlist' index='0'/>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='allTables'>
@@ -374,7 +374,7 @@
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='columnsForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theTable' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='commitTransaction'>
@@ -384,60 +384,60 @@
 <retval declared_type='BOOL' type='B'/>
 </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'/>
+<arg declared_type='NSString*' type='@' name='theColumn' index='0'/>
+<arg declared_type='NSString*' type='@' name='theTable' index='1'/>
+<arg declared_type='BOOL' type='B' name='isUnique' index='2'/>
 <retval declared_type='BOOL' type='B'/>
 </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='@'/>
+<arg declared_type='NSString*' type='@' name='theTable' index='0'/>
+<arg declared_type='NSArray*' type='@' name='theColumns' index='1'/>
+<arg declared_type='NSArray*' type='@' name='theDatatypes' index='2'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
-<method selector='databaseWithPath:' class_method='true'>
-<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
+<method class_method='true' selector='databaseWithPath:'>
+<arg declared_type='NSString*' type='@' name='thePath' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='datatypesForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theTable' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
-<method selector='decodeDataFromBase64:' class_method='true'>
-<arg index='0' name='theEncodedData' declared_type='NSString*' type='@'/>
+<method class_method='true' selector='decodeDataFromBase64:'>
+<arg declared_type='NSString*' type='@' name='theEncodedData' index='0'/>
 <retval declared_type='NSData*' type='@'/>
 </method>
 <method selector='description'>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='dropIndex:'>
-<arg index='0' name='theIndex' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theIndex' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='dropTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theTable' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
-<method selector='encodeDataToBase64:' class_method='true'>
-<arg index='0' name='theData' declared_type='NSData*' type='@'/>
+<method class_method='true' selector='encodeDataToBase64:'>
+<arg declared_type='NSData*' type='@' name='theData' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='encoding'>
 <retval declared_type='NSFEncodingType' type='i'/>
 </method>
 <method selector='executeSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theSQLStatement' index='0'/>
 <retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='indexedColumnsForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theTable' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='indexes'>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='initWithPath:'>
-<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='thePath' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='integrityCheck'>
@@ -450,19 +450,19 @@
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='journalModeAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='NSFJournalModeMode' type='i'/>
 </method>
 <method selector='maxRowUIDForTable:'>
-<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theTable' index='0'/>
 <retval declared_type='long long' type='q'/>
 </method>
-<method selector='nanoStoreEngineVersion' class_method='true'>
+<method class_method='true' selector='nanoStoreEngineVersion'>
 <retval declared_type='NSString*' type='@'/>
 </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'/>
+<arg declared_type='NSFCacheMethod' type='i' name='theCacheMethod' index='0'/>
+<arg declared_type='BOOL' type='B' name='useFastMode' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='pageSize'>
@@ -471,60 +471,60 @@
 <method selector='path'>
 <retval declared_type='NSString*' type='@'/>
 </method>
-<method selector='recommendedCacheSize' class_method='true'>
+<method class_method='true' selector='recommendedCacheSize'>
 <retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='rollbackTransaction'>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setBusyTimeout:'>
-<arg index='0' name='theTimeout' declared_type='unsigned int' type='I'/>
+<arg declared_type='unsigned int' type='I' name='theTimeout' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setCacheMethod:'>
-<arg index='0' name='cacheMethod' declared_type='NSFCacheMethod' type='i'/>
+<arg declared_type='NSFCacheMethod' type='i' name='cacheMethod' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setCacheSize:'>
-<arg index='0' name='numberOfPages' declared_type='NSUInteger' type='I'/>
+<arg declared_type='NSUInteger' type='I' name='numberOfPages' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setEncodingType:'>
-<arg index='0' name='theEncodingType' declared_type='NSFEncodingType' type='i'/>
+<arg declared_type='NSFEncodingType' type='i' name='theEncodingType' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setJournalMode:'>
-<arg index='0' name='theMode' declared_type='NSFJournalModeMode' type='i'/>
+<arg declared_type='NSFJournalModeMode' type='i' name='theMode' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setPageSize:'>
-<arg index='0' name='numberOfBytes' declared_type='NSUInteger' type='I'/>
+<arg declared_type='NSUInteger' type='I' name='numberOfBytes' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setSynchronousMode:'>
-<arg index='0' name='theSynchronousMode' declared_type='NSFSynchronousMode' type='i'/>
+<arg declared_type='NSFSynchronousMode' type='i' name='theSynchronousMode' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setTempStoreMode:'>
-<arg index='0' name='theTempStoreMode' declared_type='NSFTempStoreMode' type='i'/>
+<arg declared_type='NSFTempStoreMode' type='i' name='theTempStoreMode' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
-<method selector='sharedNanoStoreEngineDatatypes' class_method='true'>
+<method class_method='true' selector='sharedNanoStoreEngineDatatypes'>
 <retval declared_type='NSSet*' type='@'/>
 </method>
 <method selector='sqlite'>
 <retval declared_type='sqlite3*' type='^{sqlite3=}'/>
 </method>
-<method selector='sqliteVersion' class_method='true'>
+<method class_method='true' selector='sqliteVersion'>
 <retval declared_type='NSString*' type='@'/>
 </method>
-<method selector='stringWithUUID' class_method='true'>
+<method class_method='true' selector='stringWithUUID'>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='synchronousMode'>
 <retval declared_type='NSFSynchronousMode' type='i'/>
 </method>
-<method selector='systemPageSize' class_method='true'>
+<method class_method='true' selector='systemPageSize'>
 <retval declared_type='NSInteger' type='i'/>
 </method>
 <method selector='tables'>
@@ -539,19 +539,19 @@
 </class>
 <class name='NSFNanoExpression'>
 <method selector='addPredicate:withOperator:'>
-<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
-<arg index='1' name='theOperator' declared_type='NSFOperator' type='i'/>
+<arg declared_type='NSFNanoPredicate*' type='@' name='thePredicate' index='0'/>
+<arg declared_type='NSFOperator' type='i' name='theOperator' index='1'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='description'>
 <retval declared_type='NSString*' type='@'/>
 </method>
-<method selector='expressionWithPredicate:' class_method='true'>
-<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
+<method class_method='true' selector='expressionWithPredicate:'>
+<arg declared_type='NSFNanoPredicate*' type='@' name='thePredicate' index='0'/>
 <retval declared_type='NSFNanoExpression*' type='@'/>
 </method>
 <method selector='initWithPredicate:'>
-<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
+<arg declared_type='NSFNanoPredicate*' type='@' name='thePredicate' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='operators'>
@@ -563,11 +563,11 @@
 </class>
 <class name='NSFNanoObject'>
 <method selector='_setOriginalClassString:'>
-<arg index='0' name='theClassString' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theClassString' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='addEntriesFromDictionary:'>
-<arg index='0' name='otherDictionary' declared_type='NSDictionary*' type='@'/>
+<arg declared_type='NSDictionary*' type='@' name='otherDictionary' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='description'>
@@ -580,35 +580,35 @@
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='initFromDictionaryRepresentation:'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<arg declared_type='NSDictionary*' type='@' name='theDictionary' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='initFromDictionaryRepresentation:key:'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='theKey' declared_type='NSString*' type='@'/>
+<arg declared_type='NSDictionary*' type='@' name='theDictionary' index='0'/>
+<arg declared_type='NSString*' type='@' name='theKey' index='1'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='isEqualToNanoObject:'>
-<arg index='0' name='otherNanoObject' declared_type='NSFNanoObject*' type='@'/>
+<arg declared_type='NSFNanoObject*' type='@' name='otherNanoObject' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='key'>
 <retval declared_type='NSString*' type='@'/>
 </method>
-<method selector='nanoObject' class_method='true'>
+<method class_method='true' selector='nanoObject'>
 <retval declared_type='NSFNanoObject*' type='@'/>
 </method>
-<method selector='nanoObjectWithDictionary:' class_method='true'>
-<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<method class_method='true' selector='nanoObjectWithDictionary:'>
+<arg declared_type='NSDictionary*' type='@' name='theDictionary' index='0'/>
 <retval declared_type='NSFNanoObject*' type='@'/>
 </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='@'/>
+<method class_method='true' selector='nanoObjectWithDictionary:key:'>
+<arg declared_type='NSDictionary*' type='@' name='theDictionary' index='0'/>
+<arg declared_type='NSString*' type='@' name='theKey' index='1'/>
 <retval declared_type='NSFNanoObject*' type='@'/>
 </method>
 <method selector='objectForKey:'>
-<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='originalClassString'>
@@ -618,16 +618,16 @@
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectForKey:'>
-<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectsForKeys:'>
-<arg index='0' name='keyArray' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='keyArray' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setObject:forKey:'>
-<arg index='0' name='anObject' declared_type='id' type='@'/>
-<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
+<arg declared_type='id' type='@' name='anObject' index='0'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='1'/>
 <retval declared_type='void' type='v'/>
 </method>
 </class>
@@ -639,18 +639,18 @@
 <retval declared_type='NSString*' type='@'/>
 </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='NSString*' type='@'/>
+<arg declared_type='NSFTableColumnType' type='i' name='theType' index='0'/>
+<arg declared_type='NSFMatchType' type='i' name='theMatch' index='1'/>
+<arg declared_type='NSString*' type='@' name='theValue' index='2'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='match'>
 <retval declared_type='NSFMatchType' type='i'/>
 </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='NSString*' type='@'/>
+<method class_method='true' selector='predicateWithColumn:matching:value:'>
+<arg declared_type='NSFTableColumnType' type='i' name='theType' index='0'/>
+<arg declared_type='NSFMatchType' type='i' name='theMatch' index='1'/>
+<arg declared_type='NSString*' type='@' name='theValue' index='2'/>
 <retval declared_type='NSFNanoPredicate*' type='@'/>
 </method>
 <method selector='value'>
@@ -662,26 +662,26 @@
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='_initWithDictionary:'>
-<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
+<arg declared_type='NSDictionary*' type='@' name='results' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='_initWithError:'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<arg declared_type='NSError*' type='@' name='error' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='_reset'>
 <retval declared_type='void' type='v'/>
 </method>
-<method selector='_resultWithDictionary:' class_method='true'>
-<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
+<method class_method='true' selector='_resultWithDictionary:'>
+<arg declared_type='NSDictionary*' type='@' name='results' index='0'/>
 <retval declared_type='NSFNanoResult*' type='@'/>
 </method>
-<method selector='_resultWithError:' class_method='true'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<method class_method='true' selector='_resultWithError:'>
+<arg declared_type='NSError*' type='@' name='error' index='0'/>
 <retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='_setError:'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<arg declared_type='NSError*' type='@' name='error' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='columns'>
@@ -700,101 +700,101 @@
 <retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='setError:'>
-<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<arg declared_type='NSError*' type='@' name='error' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='valueAtIndex:forColumn:'>
-<arg index='0' name='theIndex' declared_type='NSUInteger' type='I'/>
-<arg index='1' name='theColumn' declared_type='NSString*' type='@'/>
+<arg declared_type='NSUInteger' type='I' name='theIndex' index='0'/>
+<arg declared_type='NSString*' type='@' name='theColumn' index='1'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='valuesForColumn:'>
-<arg index='0' name='theColumn' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theColumn' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='writeToFile:'>
-<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='thePath' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 </class>
 <class name='NSFNanoSearch'>
 <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'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='0'/>
+<arg declared_type='NSString*' type='@' name='anAttribute' index='1'/>
+<arg declared_type='NSString*' type='@' name='aValue' index='2'/>
+<arg declared_type='NSFMatchType' type='i' name='match' index='3'/>
 <retval declared_type='NSArray*' type='@'/>
 </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'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='0'/>
+<arg declared_type='NSString*' type='@' name='anAttribute' index='1'/>
+<arg declared_type='NSString*' type='@' name='aValue' index='2'/>
+<arg declared_type='NSFMatchType' type='i' name='match' index='3'/>
+<arg declared_type='NSFReturnType' type='i' name='returnedObjectType' index='4'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='_dictionaryForKeyPath:value:'>
-<arg index='0' name='keyPath' declared_type='NSString*' type='@'/>
-<arg index='1' name='value' declared_type='id' type='@'/>
+<arg declared_type='NSString*' type='@' name='keyPath' index='0'/>
+<arg declared_type='id' type='@' name='value' index='1'/>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_prepareSQLQueryStringWithExpressions:'>
-<arg index='0' name='someExpressions' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='someExpressions' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </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'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='0'/>
+<arg declared_type='NSString*' type='@' name='anAttribute' index='1'/>
+<arg declared_type='id' type='@' name='aValue' index='2'/>
+<arg declared_type='NSFMatchType' type='i' name='match' index='3'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
-<method selector='_prepareSQLQueryStringWithKeys:' class_method='true'>
-<arg index='0' name='someKeys' declared_type='NSArray*' type='@'/>
+<method class_method='true' selector='_prepareSQLQueryStringWithKeys:'>
+<arg declared_type='NSArray*' type='@' name='someKeys' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_preparedSQL'>
 <retval declared_type='NSString*' type='@'/>
 </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='@'/>
+<method class_method='true' selector='_querySegmentForAttributeColumnWithValue:matching:valueColumnWithValue:'>
+<arg declared_type='id' type='@' name='anAttributeValue' index='0'/>
+<arg declared_type='NSFMatchType' type='i' name='match' index='1'/>
+<arg declared_type='id' type='@' name='aValue' index='2'/>
 <retval declared_type='NSString*' type='@'/>
 </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'/>
+<method class_method='true' selector='_querySegmentForColumn:value:matching:'>
+<arg declared_type='NSString*' type='@' name='aColumn' index='0'/>
+<arg declared_type='id' type='@' name='aValue' index='1'/>
+<arg declared_type='NSFMatchType' type='i' name='match' index='2'/>
 <retval declared_type='NSString*' type='@'/>
 </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='@'/>
+<method class_method='true' selector='_quoteStrings:joiningWithDelimiter:'>
+<arg declared_type='NSArray*' type='@' name='strings' index='0'/>
+<arg declared_type='NSString*' type='@' name='delimiter' index='1'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_resultsFromSQLQuery:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theSQLStatement' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </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 type_modifier='o' index='2' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSFDateMatchType' type='i' name='aDateMatch' index='0'/>
+<arg declared_type='NSDate*' type='@' name='aDate' index='1'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='2'/>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_retrieveDataWithError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_sortResultsIfApplicable:returnType:'>
-<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
-<arg index='1' name='theReturnType' declared_type='NSFReturnType' type='i'/>
+<arg declared_type='NSDictionary*' type='@' name='results' index='0'/>
+<arg declared_type='NSFReturnType' type='i' name='theReturnType' index='1'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='aggregateOperation:onAttribute:'>
-<arg index='0' name='theFunctionType' declared_type='NSFAggregateFunctionType' type='i'/>
-<arg index='1' name='theAttribute' declared_type='NSString*' type='@'/>
+<arg declared_type='NSFAggregateFunctionType' type='i' name='theFunctionType' index='0'/>
+<arg declared_type='NSString*' type='@' name='theAttribute' index='1'/>
 <retval declared_type='NSNumber*' type='@'/>
 </method>
 <method selector='attribute'>
@@ -804,17 +804,17 @@
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='executeSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theSQLStatement' index='0'/>
 <retval declared_type='NSFNanoResult*' type='@'/>
 </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 type_modifier='o' index='2' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSString*' type='@' name='theSQLStatement' index='0'/>
+<arg declared_type='NSFReturnType' type='i' name='theReturnType' index='1'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='2'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='explainSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theSQLStatement' index='0'/>
 <retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='expressions'>
@@ -827,7 +827,7 @@
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='initWithStore:'>
-<arg index='0' name='theNanoStore' declared_type='NSFNanoStore*' type='@'/>
+<arg declared_type='NSFNanoStore*' type='@' name='theNanoStore' index='0'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='key'>
@@ -843,59 +843,59 @@
 <retval declared_type='void' type='v'/>
 </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 type_modifier='o' index='3' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSFDateMatchType' type='i' name='theDateMatch' index='0'/>
+<arg declared_type='NSDate*' type='@' name='theDate' index='1'/>
+<arg declared_type='NSFReturnType' type='i' name='theReturnType' index='2'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='3'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='searchObjectsWithReturnType:error:'>
-<arg index='0' name='theReturnType' declared_type='NSFReturnType' type='i'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSFReturnType' type='i' name='theReturnType' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='id' type='@'/>
 </method>
-<method selector='searchWithStore:' class_method='true'>
-<arg index='0' name='theNanoStore' declared_type='NSFNanoStore*' type='@'/>
+<method class_method='true' selector='searchWithStore:'>
+<arg declared_type='NSFNanoStore*' type='@' name='theNanoStore' index='0'/>
 <retval declared_type='NSFNanoSearch*' type='@'/>
 </method>
 <method selector='setAttribute:'>
-<arg index='0' name='attribute' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='attribute' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setAttributesToBeReturned:'>
-<arg index='0' name='attributesToBeReturned' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='attributesToBeReturned' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setExpressions:'>
-<arg index='0' name='expressions' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='expressions' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setFilterClass:'>
-<arg index='0' name='filterClass' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='filterClass' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setGroupValues:'>
-<arg index='0' name='groupValues' declared_type='BOOL' type='B'/>
+<arg declared_type='BOOL' type='B' name='groupValues' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setKey:'>
-<arg index='0' name='key' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='key' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setMatch:'>
-<arg index='0' name='match' declared_type='NSFMatchType' type='i'/>
+<arg declared_type='NSFMatchType' type='i' name='match' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setNanoStore:'>
-<arg index='0' name='nanoStore' declared_type='NSFNanoStore*' type='@'/>
+<arg declared_type='NSFNanoStore*' type='@' name='nanoStore' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setSort:'>
-<arg index='0' name='sort' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='sort' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setValue:'>
-<arg index='0' name='value' declared_type='id' type='@'/>
+<arg declared_type='id' type='@' name='value' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='sort'>
@@ -916,191 +916,191 @@
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='initWithAttribute:ascending:'>
-<arg index='0' name='theAttribute' declared_type='NSString*' type='@'/>
-<arg index='1' name='ascending' declared_type='BOOL' type='B'/>
+<arg declared_type='NSString*' type='@' name='theAttribute' index='0'/>
+<arg declared_type='BOOL' type='B' name='ascending' index='1'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='isAscending'>
 <retval declared_type='BOOL' type='B'/>
 </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'/>
+<method class_method='true' selector='sortDescriptorWithAttribute:ascending:'>
+<arg declared_type='NSString*' type='@' name='theAttribute' index='0'/>
+<arg declared_type='BOOL' type='B' name='ascending' index='1'/>
 <retval declared_type='NSFNanoSortDescriptor*' type='@'/>
 </method>
 </class>
 <class name='NSFNanoStore'>
 <method selector='_NSFDatatypeOfObject:'>
-<arg index='0' name='value' declared_type='id' type='@'/>
+<arg declared_type='id' type='@' name='value' index='0'/>
 <retval declared_type='NSFNanoDatatype' type='i'/>
 </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 type_modifier='o' index='2' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSArray*' type='@' name='someObjects' index='0'/>
+<arg declared_type='NSArray*' type='@' name='someKeys' index='1'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='2'/>
 <retval declared_type='BOOL' type='B'/>
 </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 type_modifier='o' index='2' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSArray*' type='@' name='someObjects' index='0'/>
+<arg declared_type='BOOL' type='B' name='forceSave' index='1'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='2'/>
 <retval declared_type='BOOL' type='B'/>
 </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 type_modifier='o' index='3' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSString*' type='@' name='aPath' index='0'/>
+<arg declared_type='NSString*' type='@' name='anExtension' index='1'/>
+<arg declared_type='BOOL' type='B' name='flag' index='2'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='3'/>
 <retval declared_type='BOOL' type='B'/>
 </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 type_modifier='o' index='3' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSString*' type='@' name='aPath' index='0'/>
+<arg declared_type='NSString*' type='@' name='anExtension' index='1'/>
+<arg declared_type='BOOL' type='B' name='flag' index='2'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='3'/>
 <retval declared_type='BOOL' type='B'/>
 </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=}'/>
+<arg declared_type='id' type='@' name='aValue' index='0'/>
+<arg declared_type='NSString*' type='@' name='anAttribute' index='1'/>
+<arg declared_type='NSInteger' type='i' name='aParamNumber' index='2'/>
+<arg declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}' name='aStatement' index='3'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
-<method selector='_calendarDateToString:' class_method='true'>
-<arg index='0' name='aDate' declared_type='NSDate*' type='@'/>
+<method class_method='true' selector='_calendarDateToString:'>
+<arg declared_type='NSDate*' type='@' name='aDate' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_checkNanoStoreIsReadyAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
-<method selector='_createAndOpenDebugDatabase' class_method='true'>
+<method class_method='true' selector='_createAndOpenDebugDatabase'>
 <retval declared_type='NSFNanoStore*' type='@'/>
 </method>
-<method selector='_defaultTestData' class_method='true'>
+<method class_method='true' selector='_defaultTestData'>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_executeSQL:'>
-<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theSQLStatement' index='0'/>
 <retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='_executeSQLite3StepUsingSQLite3Statement:'>
-<arg index='0' name='aStatement' declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}'/>
+<arg declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}' name='aStatement' index='0'/>
 <retval declared_type='void' type='v'/>
 </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='^@'/>
+<arg declared_type='id' type='@' name='someObject' index='0'/>
+<arg declared_type='NSMutableArray**' type='^@' name='aKeyPath' index='1'/>
+<arg declared_type='NSMutableArray**' type='^@' name='someKeys' index='2'/>
+<arg declared_type='NSMutableArray**' type='^@' name='someValues' index='3'/>
 <retval declared_type='void' type='v'/>
 </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='^@'/>
+<arg declared_type='NSDictionary*' type='@' name='info' index='0'/>
+<arg declared_type='NSMutableArray**' type='^@' name='flattenedKeys' index='1'/>
+<arg declared_type='NSMutableArray**' type='^@' name='flattenedValues' index='2'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='_initializePreparedStatementsWithError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_isOurTransaction'>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_nestedDescriptionWithPrefixedSpace:'>
-<arg index='0' name='prefixedSpace' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='prefixedSpace' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </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='@'/>
+<arg declared_type='sqlite3_stmt**' type='^^{sqlite3_stmt}' name='aStatement' index='0'/>
+<arg declared_type='NSString*' type='@' name='aSQLQuery' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_releasePreparedStatements'>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='_setIsOurTransaction:'>
-<arg index='0' name='value' declared_type='BOOL' type='B'/>
+<arg declared_type='BOOL' type='B' name='value' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='_setupCachingSchema'>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_storeDictionary:forKey:forClassNamed:usingSQLite3Statement: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' name='storeValuesStatement' declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}'/>
-<arg type_modifier='o' index='4' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSDictionary*' type='@' name='someInfo' index='0'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='1'/>
+<arg declared_type='NSString*' type='@' name='classType' index='2'/>
+<arg declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}' name='storeValuesStatement' index='3'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='4'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_stringFromValue:'>
-<arg index='0' name='aValue' declared_type='id' type='@'/>
+<arg declared_type='id' type='@' name='aValue' index='0'/>
 <retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='addObject:error:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='id' type='@' name='theObject' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='addObjectsFromArray:error:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSArray*' type='@' name='theObjects' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='allObjectClasses'>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='bagWithName:'>
-<arg index='0' name='theName' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theName' index='0'/>
 <retval declared_type='NSFNanoBag*' type='@'/>
 </method>
 <method selector='bags'>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='bagsContainingObjectWithKey:'>
-<arg index='0' name='theKey' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theKey' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='bagsWithKeysInArray:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='theKeys' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='beginTransactionAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='clearIndexesAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='closeWithError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='commitTransactionAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='compactStoreAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='countOfObjectsOfClassNamed:'>
-<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theClassName' index='0'/>
 <retval declared_type='long long' type='q'/>
 </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 type_modifier='o' index='2' name='outError' declared_type='NSError**' type='^@'/>
+<method class_method='true' selector='createAndOpenStoreWithType:path:error:'>
+<arg declared_type='NSFNanoStoreType' type='i' name='theType' index='0'/>
+<arg declared_type='NSString*' type='@' name='thePath' index='1'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='2'/>
 <retval declared_type='NSFNanoStore*' type='@'/>
 </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='@'/>
+<method class_method='true' selector='createStoreWithType:path:'>
+<arg declared_type='NSFNanoStoreType' type='i' name='theType' index='0'/>
+<arg declared_type='NSString*' type='@' name='thePath' index='1'/>
 <retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 <method selector='description'>
@@ -1116,8 +1116,8 @@
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='initStoreWithType:path:'>
-<arg index='0' name='theType' declared_type='NSFNanoStoreType' type='i'/>
-<arg index='1' name='thePath' declared_type='NSString*' type='@'/>
+<arg declared_type='NSFNanoStoreType' type='i' name='theType' index='0'/>
+<arg declared_type='NSString*' type='@' name='thePath' index='1'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='isClosed'>
@@ -1130,80 +1130,80 @@
 <retval declared_type='NSFNanoEngine*' type='@'/>
 </method>
 <method selector='objectsOfClassNamed:'>
-<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theClassName' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='objectsOfClassNamed:usingSortDescriptors:'>
-<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
-<arg index='1' name='theSortDescriptors' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSString*' type='@' name='theClassName' index='0'/>
+<arg declared_type='NSArray*' type='@' name='theSortDescriptors' index='1'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='objectsWithKeysInArray:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
+<arg declared_type='NSArray*' type='@' name='theKeys' index='0'/>
 <retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='openWithError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='rebuildIndexesAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeAllObjectsFromStoreAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeObject:error:'>
-<arg index='0' name='theObject' declared_type='id' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='id' type='@' name='theObject' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeObjectsInArray:error:'>
-<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSArray*' type='@' name='theObjects' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeObjectsWithKeysInArray:error:'>
-<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
-<arg type_modifier='o' index='1' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSArray*' type='@' name='theKeys' index='0'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='1'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='rollbackTransactionAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='saveInterval'>
 <retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='saveStoreAndReturnError:'>
-<arg type_modifier='o' index='0' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='0'/>
 <retval declared_type='BOOL' type='B'/>
 </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 type_modifier='o' index='2' name='outError' declared_type='NSError**' type='^@'/>
+<arg declared_type='NSString*' type='@' name='thePath' index='0'/>
+<arg declared_type='BOOL' type='B' name='shouldCompact' index='1'/>
+<arg declared_type='NSError**' type='^@' name='outError' type_modifier='o' index='2'/>
 <retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setNanoEngineProcessingMode:'>
-<arg index='0' name='nanoEngineProcessingMode' declared_type='NSFEngineProcessingMode' type='i'/>
+<arg declared_type='NSFEngineProcessingMode' type='i' name='nanoEngineProcessingMode' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setNanoStoreEngine:'>
-<arg index='0' name='nanoStoreEngine' declared_type='NSFNanoEngine*' type='@'/>
+<arg declared_type='NSFNanoEngine*' type='@' name='nanoStoreEngine' index='0'/>
 <retval declared_type='void' type='v'/>
 </method>
 <method selector='setSaveInterval:'>
-<arg index='0' name='saveInterval' declared_type='NSUInteger' type='I'/>
+<arg declared_type='NSUInteger' type='I' name='saveInterval' index='0'/>
 <retval declared_type='void' type='v'/>
 </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='@'/>
+<arg declared_type='NSDictionary*' type='@' name='theDictionary' index='0'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='1'/>
+<arg declared_type='NSFNanoStore*' type='@' name='theStore' index='2'/>
 <retval declared_type='id' type='@'/>
 </method>
 <method selector='nanoObjectDictionaryRepresentation'>
@@ -1217,19 +1217,19 @@
 </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='@'/>
+<method type='@20@0:4@8@12@16' selector='initNanoObjectFromDictionaryRepresentation:forKey:store:'>
+<arg declared_type='NSDictionary*' type='@' name='theDictionary' index='0'/>
+<arg declared_type='NSString*' type='@' name='aKey' index='1'/>
+<arg declared_type='NSFNanoStore*' type='@' name='theStore' index='2'/>
 <retval declared_type='id' type='@'/>
 </method>
-<method selector='nanoObjectDictionaryRepresentation' type='@8@0:4'>
+<method type='@8@0:4' selector='nanoObjectDictionaryRepresentation'>
 <retval declared_type='NSDictionary*' type='@'/>
 </method>
-<method selector='nanoObjectKey' type='@8@0:4'>
+<method type='@8@0:4' selector='nanoObjectKey'>
 <retval declared_type='NSString*' type='@'/>
 </method>
-<method selector='rootObject' type='@8@0:4'>
+<method type='@8@0:4' selector='rootObject'>
 <retval declared_type='id' type='@'/>
 </method>
 </informal_protocol>