diff --git a/semantics3-objc/JSONKit.m b/semantics3-objc/JSONKit.m
index 4994caf..595d9dd 100644
--- a/semantics3-objc/JSONKit.m
+++ b/semantics3-objc/JSONKit.m
@@ -35,7 +35,7 @@
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /*
  Copyright 2011 John Engelhart
@@ -51,34 +51,34 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-*/
+ */
 
 
 /*
-  Acknowledgments:
-
-  The bulk of the UTF8 / UTF32 conversion and verification comes
-  from ConvertUTF.[hc].  It has been modified from the original sources.
-
-  The original sources were obtained from http://www.unicode.org/.
-  However, the web site no longer seems to host the files.  Instead,
-  the Unicode FAQ http://www.unicode.org/faq//utf_bom.html#gen4
-  points to International Components for Unicode (ICU)
-  http://site.icu-project.org/ as an example of how to write a UTF
-  converter.
-
-  The decision to use the ConvertUTF.[ch] code was made to leverage
-  "proven" code.  Hopefully the local modifications are bug free.
-
-  The code in isValidCodePoint() is derived from the ICU code in
-  utf.h for the macros U_IS_UNICODE_NONCHAR and U_IS_UNICODE_CHAR.
-
-  From the original ConvertUTF.[ch]:
-
+ Acknowledgments:
+ 
+ The bulk of the UTF8 / UTF32 conversion and verification comes
+ from ConvertUTF.[hc].  It has been modified from the original sources.
+ 
+ The original sources were obtained from http://www.unicode.org/.
+ However, the web site no longer seems to host the files.  Instead,
+ the Unicode FAQ http://www.unicode.org/faq//utf_bom.html#gen4
+ points to International Components for Unicode (ICU)
+ http://site.icu-project.org/ as an example of how to write a UTF
+ converter.
+ 
+ The decision to use the ConvertUTF.[ch] code was made to leverage
+ "proven" code.  Hopefully the local modifications are bug free.
+ 
+ The code in isValidCodePoint() is derived from the ICU code in
+ utf.h for the macros U_IS_UNICODE_NONCHAR and U_IS_UNICODE_CHAR.
+ 
+ From the original ConvertUTF.[ch]:
+ 
  * Copyright 2001-2004 Unicode, Inc.
- * 
+ *
  * Disclaimer
- * 
+ *
  * This source code is provided as is by Unicode, Inc. No claims are
  * made as to fitness for any particular purpose. No warranties of any
  * kind are expressed or implied. The recipient agrees to determine
@@ -86,16 +86,16 @@ The code in isValidCodePoint() is derived from the ICU code in
  * purchased on magnetic or optical media from Unicode, Inc., the
  * sole remedy for any claim will be exchange of defective media
  * within 90 days of receipt.
- * 
+ *
  * Limitations on Rights to Redistribute This Code
- * 
+ *
  * Unicode, Inc. hereby grants the right to freely use the information
  * supplied in this file in the creation of products supporting the
  * Unicode Standard, and to make copies of this file in any form
  * for internal or external distribution as long as this notice
  * remains attached.
-
-*/
+ 
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -196,13 +196,13 @@ The code in isValidCodePoint() is derived from the ICU code in
 #define JK_EXPECT_T(cond)               JK_EXPECTED(cond, 1U)
 #define JK_EXPECT_F(cond)               JK_EXPECTED(cond, 0U)
 #define JK_PREFETCH(ptr)                __builtin_prefetch(ptr)
-#else  // defined (__GNUC__) && (__GNUC__ >= 4) 
+#else  // defined (__GNUC__) && (__GNUC__ >= 4)
 #define JK_ATTRIBUTES(attr, ...)
 #define JK_EXPECTED(cond, expect)       (cond)
 #define JK_EXPECT_T(cond)               (cond)
 #define JK_EXPECT_F(cond)               (cond)
 #define JK_PREFETCH(ptr)
-#endif // defined (__GNUC__) && (__GNUC__ >= 4) 
+#endif // defined (__GNUC__) && (__GNUC__ >= 4)
 
 #define JK_STATIC_INLINE                         static __inline__ JK_ATTRIBUTES(always_inline)
 #define JK_ALIGNED(arg)                                            JK_ATTRIBUTES(aligned(arg))
@@ -226,111 +226,111 @@ The code in isValidCodePoint() is derived from the ICU code in
 @class JKArray, JKDictionaryEnumerator, JKDictionary;
 
 enum {
-  JSONNumberStateStart                 = 0,
-  JSONNumberStateFinished              = 1,
-  JSONNumberStateError                 = 2,
-  JSONNumberStateWholeNumberStart      = 3,
-  JSONNumberStateWholeNumberMinus      = 4,
-  JSONNumberStateWholeNumberZero       = 5,
-  JSONNumberStateWholeNumber           = 6,
-  JSONNumberStatePeriod                = 7,
-  JSONNumberStateFractionalNumberStart = 8,
-  JSONNumberStateFractionalNumber      = 9,
-  JSONNumberStateExponentStart         = 10,
-  JSONNumberStateExponentPlusMinus     = 11,
-  JSONNumberStateExponent              = 12,
+    JSONNumberStateStart                 = 0,
+    JSONNumberStateFinished              = 1,
+    JSONNumberStateError                 = 2,
+    JSONNumberStateWholeNumberStart      = 3,
+    JSONNumberStateWholeNumberMinus      = 4,
+    JSONNumberStateWholeNumberZero       = 5,
+    JSONNumberStateWholeNumber           = 6,
+    JSONNumberStatePeriod                = 7,
+    JSONNumberStateFractionalNumberStart = 8,
+    JSONNumberStateFractionalNumber      = 9,
+    JSONNumberStateExponentStart         = 10,
+    JSONNumberStateExponentPlusMinus     = 11,
+    JSONNumberStateExponent              = 12,
 };
 
 enum {
-  JSONStringStateStart                           = 0,
-  JSONStringStateParsing                         = 1,
-  JSONStringStateFinished                        = 2,
-  JSONStringStateError                           = 3,
-  JSONStringStateEscape                          = 4,
-  JSONStringStateEscapedUnicode1                 = 5,
-  JSONStringStateEscapedUnicode2                 = 6,
-  JSONStringStateEscapedUnicode3                 = 7,
-  JSONStringStateEscapedUnicode4                 = 8,
-  JSONStringStateEscapedUnicodeSurrogate1        = 9,
-  JSONStringStateEscapedUnicodeSurrogate2        = 10,
-  JSONStringStateEscapedUnicodeSurrogate3        = 11,
-  JSONStringStateEscapedUnicodeSurrogate4        = 12,
-  JSONStringStateEscapedNeedEscapeForSurrogate   = 13,
-  JSONStringStateEscapedNeedEscapedUForSurrogate = 14,
+    JSONStringStateStart                           = 0,
+    JSONStringStateParsing                         = 1,
+    JSONStringStateFinished                        = 2,
+    JSONStringStateError                           = 3,
+    JSONStringStateEscape                          = 4,
+    JSONStringStateEscapedUnicode1                 = 5,
+    JSONStringStateEscapedUnicode2                 = 6,
+    JSONStringStateEscapedUnicode3                 = 7,
+    JSONStringStateEscapedUnicode4                 = 8,
+    JSONStringStateEscapedUnicodeSurrogate1        = 9,
+    JSONStringStateEscapedUnicodeSurrogate2        = 10,
+    JSONStringStateEscapedUnicodeSurrogate3        = 11,
+    JSONStringStateEscapedUnicodeSurrogate4        = 12,
+    JSONStringStateEscapedNeedEscapeForSurrogate   = 13,
+    JSONStringStateEscapedNeedEscapedUForSurrogate = 14,
 };
 
 enum {
-  JKParseAcceptValue      = (1 << 0),
-  JKParseAcceptComma      = (1 << 1),
-  JKParseAcceptEnd        = (1 << 2),
-  JKParseAcceptValueOrEnd = (JKParseAcceptValue | JKParseAcceptEnd),
-  JKParseAcceptCommaOrEnd = (JKParseAcceptComma | JKParseAcceptEnd),
+    JKParseAcceptValue      = (1 << 0),
+    JKParseAcceptComma      = (1 << 1),
+    JKParseAcceptEnd        = (1 << 2),
+    JKParseAcceptValueOrEnd = (JKParseAcceptValue | JKParseAcceptEnd),
+    JKParseAcceptCommaOrEnd = (JKParseAcceptComma | JKParseAcceptEnd),
 };
 
 enum {
-  JKClassUnknown    = 0,
-  JKClassString     = 1,
-  JKClassNumber     = 2,
-  JKClassArray      = 3,
-  JKClassDictionary = 4,
-  JKClassNull       = 5,
+    JKClassUnknown    = 0,
+    JKClassString     = 1,
+    JKClassNumber     = 2,
+    JKClassArray      = 3,
+    JKClassDictionary = 4,
+    JKClassNull       = 5,
 };
 
 enum {
-  JKManagedBufferOnStack        = 1,
-  JKManagedBufferOnHeap         = 2,
-  JKManagedBufferLocationMask   = (0x3),
-  JKManagedBufferLocationShift  = (0),
-  
-  JKManagedBufferMustFree       = (1 << 2),
+    JKManagedBufferOnStack        = 1,
+    JKManagedBufferOnHeap         = 2,
+    JKManagedBufferLocationMask   = (0x3),
+    JKManagedBufferLocationShift  = (0),
+    
+    JKManagedBufferMustFree       = (1 << 2),
 };
 typedef JKFlags JKManagedBufferFlags;
 
 enum {
-  JKObjectStackOnStack        = 1,
-  JKObjectStackOnHeap         = 2,
-  JKObjectStackLocationMask   = (0x3),
-  JKObjectStackLocationShift  = (0),
-  
-  JKObjectStackMustFree       = (1 << 2),
+    JKObjectStackOnStack        = 1,
+    JKObjectStackOnHeap         = 2,
+    JKObjectStackLocationMask   = (0x3),
+    JKObjectStackLocationShift  = (0),
+    
+    JKObjectStackMustFree       = (1 << 2),
 };
 typedef JKFlags JKObjectStackFlags;
 
 enum {
-  JKTokenTypeInvalid     = 0,
-  JKTokenTypeNumber      = 1,
-  JKTokenTypeString      = 2,
-  JKTokenTypeObjectBegin = 3,
-  JKTokenTypeObjectEnd   = 4,
-  JKTokenTypeArrayBegin  = 5,
-  JKTokenTypeArrayEnd    = 6,
-  JKTokenTypeSeparator   = 7,
-  JKTokenTypeComma       = 8,
-  JKTokenTypeTrue        = 9,
-  JKTokenTypeFalse       = 10,
-  JKTokenTypeNull        = 11,
-  JKTokenTypeWhiteSpace  = 12,
+    JKTokenTypeInvalid     = 0,
+    JKTokenTypeNumber      = 1,
+    JKTokenTypeString      = 2,
+    JKTokenTypeObjectBegin = 3,
+    JKTokenTypeObjectEnd   = 4,
+    JKTokenTypeArrayBegin  = 5,
+    JKTokenTypeArrayEnd    = 6,
+    JKTokenTypeSeparator   = 7,
+    JKTokenTypeComma       = 8,
+    JKTokenTypeTrue        = 9,
+    JKTokenTypeFalse       = 10,
+    JKTokenTypeNull        = 11,
+    JKTokenTypeWhiteSpace  = 12,
 };
 typedef NSUInteger JKTokenType;
 
 // These are prime numbers to assist with hash slot probing.
 enum {
-  JKValueTypeNone             = 0,
-  JKValueTypeString           = 5,
-  JKValueTypeLongLong         = 7,
-  JKValueTypeUnsignedLongLong = 11,
-  JKValueTypeDouble           = 13,
+    JKValueTypeNone             = 0,
+    JKValueTypeString           = 5,
+    JKValueTypeLongLong         = 7,
+    JKValueTypeUnsignedLongLong = 11,
+    JKValueTypeDouble           = 13,
 };
 typedef NSUInteger JKValueType;
 
 enum {
-  JKEncodeOptionAsData              = 1,
-  JKEncodeOptionAsString            = 2,
-  JKEncodeOptionAsTypeMask          = 0x7,
-  JKEncodeOptionCollectionObj       = (1 << 3),
-  JKEncodeOptionStringObj           = (1 << 4),
-  JKEncodeOptionStringObjTrimQuotes = (1 << 5),
-  
+    JKEncodeOptionAsData              = 1,
+    JKEncodeOptionAsString            = 2,
+    JKEncodeOptionAsTypeMask          = 0x7,
+    JKEncodeOptionCollectionObj       = (1 << 3),
+    JKEncodeOptionStringObj           = (1 << 4),
+    JKEncodeOptionStringObjTrimQuotes = (1 << 5),
+    
 };
 typedef NSUInteger JKEncodeOptionType;
 
@@ -362,130 +362,130 @@ The code in isValidCodePoint() is derived from the ICU code in
 
 
 struct JKPtrRange {
-  unsigned char *ptr;
-  size_t         length;
+    unsigned char *ptr;
+    size_t         length;
 };
 
 struct JKConstPtrRange {
-  const unsigned char *ptr;
-  size_t               length;
+    const unsigned char *ptr;
+    size_t               length;
 };
 
 struct JKRange {
-  size_t location, length;
+    size_t location, length;
 };
 
 struct JKManagedBuffer {
-  JKPtrRange           bytes;
-  JKManagedBufferFlags flags;
-  size_t               roundSizeUpToMultipleOf;
+    JKPtrRange           bytes;
+    JKManagedBufferFlags flags;
+    size_t               roundSizeUpToMultipleOf;
 };
 
 struct JKObjectStack {
-  void               **objects, **keys;
-  CFHashCode          *cfHashes;
-  size_t               count, index, roundSizeUpToMultipleOf;
-  JKObjectStackFlags   flags;
+    void               **objects, **keys;
+    CFHashCode          *cfHashes;
+    size_t               count, index, roundSizeUpToMultipleOf;
+    JKObjectStackFlags   flags;
 };
 
 struct JKBuffer {
-  JKPtrRange bytes;
+    JKPtrRange bytes;
 };
 
 struct JKConstBuffer {
-  JKConstPtrRange bytes;
+    JKConstPtrRange bytes;
 };
 
 struct JKTokenValue {
-  JKConstPtrRange   ptrRange;
-  JKValueType       type;
-  JKHash            hash;
-  union {
-    long long          longLongValue;
-    unsigned long long unsignedLongLongValue;
-    double             doubleValue;
-  } number;
-  JKTokenCacheItem *cacheItem;
+    JKConstPtrRange   ptrRange;
+    JKValueType       type;
+    JKHash            hash;
+    union {
+        long long          longLongValue;
+        unsigned long long unsignedLongLongValue;
+        double             doubleValue;
+    } number;
+    JKTokenCacheItem *cacheItem;
 };
 
 struct JKParseToken {
-  JKConstPtrRange tokenPtrRange;
-  JKTokenType     type;
-  JKTokenValue    value;
-  JKManagedBuffer tokenBuffer;
+    JKConstPtrRange tokenPtrRange;
+    JKTokenType     type;
+    JKTokenValue    value;
+    JKManagedBuffer tokenBuffer;
 };
 
 struct JKTokenCacheItem {
-  void          *object;
-  JKHash         hash;
-  CFHashCode     cfHash;
-  size_t         size;
-  unsigned char *bytes;
-  JKValueType    type;
+    void          *object;
+    JKHash         hash;
+    CFHashCode     cfHash;
+    size_t         size;
+    unsigned char *bytes;
+    JKValueType    type;
 };
 
 struct JKTokenCache {
-  JKTokenCacheItem *items;
-  size_t            count;
-  unsigned int      prng_lfsr;
-  unsigned char     age[JK_CACHE_SLOTS];
+    JKTokenCacheItem *items;
+    size_t            count;
+    unsigned int      prng_lfsr;
+    unsigned char     age[JK_CACHE_SLOTS];
 };
 
 struct JKObjCImpCache {
-  Class                               NSNumberClass;
-  NSNumberAllocImp                    NSNumberAlloc;
-  NSNumberInitWithUnsignedLongLongImp NSNumberInitWithUnsignedLongLong;
+    Class                               NSNumberClass;
+    NSNumberAllocImp                    NSNumberAlloc;
+    NSNumberInitWithUnsignedLongLongImp NSNumberInitWithUnsignedLongLong;
 };
 
 struct JKParseState {
-  JKParseOptionFlags  parseOptionFlags;
-  JKConstBuffer       stringBuffer;
-  size_t              atIndex, lineNumber, lineStartIndex;
-  size_t              prev_atIndex, prev_lineNumber, prev_lineStartIndex;
-  JKParseToken        token;
-  JKObjectStack       objectStack;
-  JKTokenCache        cache;
-  JKObjCImpCache      objCImpCache;
-  NSError            *error;
-  int                 errorIsPrev;
-  BOOL                mutableCollections;
+    JKParseOptionFlags  parseOptionFlags;
+    JKConstBuffer       stringBuffer;
+    size_t              atIndex, lineNumber, lineStartIndex;
+    size_t              prev_atIndex, prev_lineNumber, prev_lineStartIndex;
+    JKParseToken        token;
+    JKObjectStack       objectStack;
+    JKTokenCache        cache;
+    JKObjCImpCache      objCImpCache;
+    NSError            *error;
+    int                 errorIsPrev;
+    BOOL                mutableCollections;
 };
 
 struct JKFastClassLookup {
-  void *stringClass;
-  void *numberClass;
-  void *arrayClass;
-  void *dictionaryClass;
-  void *nullClass;
+    void *stringClass;
+    void *numberClass;
+    void *arrayClass;
+    void *dictionaryClass;
+    void *nullClass;
 };
 
 struct JKEncodeCache {
-  id object;
-  size_t offset;
-  size_t length;
+    id object;
+    size_t offset;
+    size_t length;
 };
 
 struct JKEncodeState {
-  JKManagedBuffer         utf8ConversionBuffer;
-  JKManagedBuffer         stringBuffer;
-  size_t                  atIndex;
-  JKFastClassLookup       fastClassLookup;
-  JKEncodeCache           cache[JK_ENCODE_CACHE_SLOTS];
-  JKSerializeOptionFlags  serializeOptionFlags;
-  JKEncodeOptionType      encodeOption;
-  size_t                  depth;
-  NSError                *error;
-  id                      classFormatterDelegate;
-  SEL                     classFormatterSelector;
-  JKClassFormatterIMP     classFormatterIMP;
+    JKManagedBuffer         utf8ConversionBuffer;
+    JKManagedBuffer         stringBuffer;
+    size_t                  atIndex;
+    JKFastClassLookup       fastClassLookup;
+    JKEncodeCache           cache[JK_ENCODE_CACHE_SLOTS];
+    JKSerializeOptionFlags  serializeOptionFlags;
+    JKEncodeOptionType      encodeOption;
+    size_t                  depth;
+    NSError                *error;
+    id                      classFormatterDelegate;
+    SEL                     classFormatterSelector;
+    JKClassFormatterIMP     classFormatterIMP;
 #ifdef __BLOCKS__
-  JKClassFormatterBlock   classFormatterBlock;
+    JKClassFormatterBlock   classFormatterBlock;
 #endif
 };
 
 // This is a JSONKit private class.
 @interface JKSerializer : NSObject {
-  JKEncodeState *encodeState;
+    JKEncodeState *encodeState;
 }
 
 #ifdef __BLOCKS__
@@ -501,8 +501,8 @@ - (void)releaseState;
 @end
 
 struct JKHashTableEntry {
-  NSUInteger keyHash;
-  id key, object;
+    NSUInteger keyHash;
+    id key, object;
 };
 
 
@@ -511,10 +511,10 @@ - (void)releaseState;
 typedef uint8_t  UTF8;  /* typically 8 bits */
 
 typedef enum {
-  conversionOK,           /* conversion successful */
-  sourceExhausted,        /* partial character in source, but hit end */
-  targetExhausted,        /* insuff. room in target for conversion */
-  sourceIllegal           /* source sequence is illegal/malformed */
+    conversionOK,           /* conversion successful */
+    sourceExhausted,        /* partial character in source, but hit end */
+    targetExhausted,        /* insuff. room in target for conversion */
+    sourceIllegal           /* source sequence is illegal/malformed */
 } ConversionResult;
 
 #define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
@@ -612,7 +612,7 @@ - (void)releaseState;
 JK_STATIC_INLINE JKHash jk_calculateHash(JKHash currentHash, unsigned char c);
 
 // JSONKit v1.4 used both a JKArray : NSArray and JKMutableArray : NSMutableArray, and the same for the dictionary collection type.
-// However, Louis Gerbarg (via cocoa-dev) pointed out that Cocoa / Core Foundation actually implements only a single class that inherits from the 
+// However, Louis Gerbarg (via cocoa-dev) pointed out that Cocoa / Core Foundation actually implements only a single class that inherits from the
 // mutable version, and keeps an ivar bit for whether or not that instance is mutable.  This means that the immutable versions of the collection
 // classes receive the mutating methods, but this is handled by having those methods throw an exception when the ivar bit is set to immutable.
 // We adopt the same strategy here.  It's both cleaner and gets rid of the method swizzling hackery used in JSONKit v1.4.
@@ -635,32 +635,32 @@ - (void)releaseState;
 extern void jk_collectionClassLoadTimeInitialization(void) __attribute__ ((constructor));
 
 void jk_collectionClassLoadTimeInitialization(void) {
-  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; // Though technically not required, the run time environment at load time initialization may be less than ideal.
-  
-  _JKArrayClass             = objc_getClass("JKArray");
-  _JKArrayInstanceSize      = jk_max(16UL, class_getInstanceSize(_JKArrayClass));
-  
-  _JKDictionaryClass        = objc_getClass("JKDictionary");
-  _JKDictionaryInstanceSize = jk_max(16UL, class_getInstanceSize(_JKDictionaryClass));
-  
-  // For JSONDecoder...
-  _jk_NSNumberClass = [NSNumber class];
-  _jk_NSNumberAllocImp = (NSNumberAllocImp)[NSNumber methodForSelector:@selector(alloc)];
-  
-  // Hacktacular.  Need to do it this way due to the nature of class clusters.
-  id temp_NSNumber = [NSNumber alloc];
-  _jk_NSNumberInitWithUnsignedLongLongImp = (NSNumberInitWithUnsignedLongLongImp)[temp_NSNumber methodForSelector:@selector(initWithUnsignedLongLong:)];
-  [[temp_NSNumber init] release];
-  temp_NSNumber = NULL;
-  
-  [pool release]; pool = NULL;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; // Though technically not required, the run time environment at load time initialization may be less than ideal.
+    
+    _JKArrayClass             = objc_getClass("JKArray");
+    _JKArrayInstanceSize      = jk_max(16UL, class_getInstanceSize(_JKArrayClass));
+    
+    _JKDictionaryClass        = objc_getClass("JKDictionary");
+    _JKDictionaryInstanceSize = jk_max(16UL, class_getInstanceSize(_JKDictionaryClass));
+    
+    // For JSONDecoder...
+    _jk_NSNumberClass = [NSNumber class];
+    _jk_NSNumberAllocImp = (NSNumberAllocImp)[NSNumber methodForSelector:@selector(alloc)];
+    
+    // Hacktacular.  Need to do it this way due to the nature of class clusters.
+    id temp_NSNumber = [NSNumber alloc];
+    _jk_NSNumberInitWithUnsignedLongLongImp = (NSNumberInitWithUnsignedLongLongImp)[temp_NSNumber methodForSelector:@selector(initWithUnsignedLongLong:)];
+    [[temp_NSNumber init] release];
+    temp_NSNumber = NULL;
+    
+    [pool release]; pool = NULL;
 }
 
 
 #pragma mark -
 @interface JKArray : NSMutableArray <NSCopying, NSMutableCopying, NSFastEnumeration> {
-  id         *objects;
-  NSUInteger  count, capacity, mutations;
+    id         *objects;
+    NSUInteger  count, capacity, mutations;
 }
 @end
 
@@ -669,151 +669,151 @@ @implementation JKArray
 + (id)allocWithZone:(NSZone *)zone
 {
 #pragma unused(zone)
-  [NSException raise:NSInvalidArgumentException format:@"*** - [%@ %@]: The %@ class is private to JSONKit and should not be used in this fashion.", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSStringFromClass([self class])];
-  return(NULL);
+    [NSException raise:NSInvalidArgumentException format:@"*** - [%@ %@]: The %@ class is private to JSONKit and should not be used in this fashion.", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSStringFromClass([self class])];
+    return(NULL);
 }
 
 static JKArray *_JKArrayCreate(id *objects, NSUInteger count, BOOL mutableCollection) {
-  NSCParameterAssert((objects != NULL) && (_JKArrayClass != NULL) && (_JKArrayInstanceSize > 0UL));
-  JKArray *array = NULL;
-  if(JK_EXPECT_T((array = (JKArray *)calloc(1UL, _JKArrayInstanceSize)) != NULL)) { // Directly allocate the JKArray instance via calloc.
-    object_setClass(array, _JKArrayClass);
-    if((array = [array init]) == NULL) { return(NULL); }
-    array->capacity = count;
-    array->count    = count;
-    if(JK_EXPECT_F((array->objects = (id *)malloc(sizeof(id) * array->capacity)) == NULL)) { [array autorelease]; return(NULL); }
-    memcpy(array->objects, objects, array->capacity * sizeof(id));
-    array->mutations = (mutableCollection == NO) ? 0UL : 1UL;
-  }
-  return(array);
+    NSCParameterAssert((objects != NULL) && (_JKArrayClass != NULL) && (_JKArrayInstanceSize > 0UL));
+    JKArray *array = NULL;
+    if(JK_EXPECT_T((array = (JKArray *)calloc(1UL, _JKArrayInstanceSize)) != NULL)) { // Directly allocate the JKArray instance via calloc.
+        object_setClass(array, _JKArrayClass);
+        if((array = [array init]) == NULL) { return(NULL); }
+        array->capacity = count;
+        array->count    = count;
+        if(JK_EXPECT_F((array->objects = (id *)malloc(sizeof(id) * array->capacity)) == NULL)) { [array autorelease]; return(NULL); }
+        memcpy(array->objects, objects, array->capacity * sizeof(id));
+        array->mutations = (mutableCollection == NO) ? 0UL : 1UL;
+    }
+    return(array);
 }
 
 // Note: The caller is responsible for -retaining the object that is to be added.
 static void _JKArrayInsertObjectAtIndex(JKArray *array, id newObject, NSUInteger objectIndex) {
-  NSCParameterAssert((array != NULL) && (array->objects != NULL) && (array->count <= array->capacity) && (objectIndex <= array->count) && (newObject != NULL));
-  if(!((array != NULL) && (array->objects != NULL) && (objectIndex <= array->count) && (newObject != NULL))) { [newObject autorelease]; return; }
-  if((array->count + 1UL) >= array->capacity) {
-    id *newObjects = NULL;
-    if((newObjects = (id *)realloc(array->objects, sizeof(id) * (array->capacity + 16UL))) == NULL) { [NSException raise:NSMallocException format:@"Unable to resize objects array."]; }
-    array->objects = newObjects;
-    array->capacity += 16UL;
-    memset(&array->objects[array->count], 0, sizeof(id) * (array->capacity - array->count));
-  }
-  array->count++;
-  if((objectIndex + 1UL) < array->count) { memmove(&array->objects[objectIndex + 1UL], &array->objects[objectIndex], sizeof(id) * ((array->count - 1UL) - objectIndex)); array->objects[objectIndex] = NULL; }
-  array->objects[objectIndex] = newObject;
+    NSCParameterAssert((array != NULL) && (array->objects != NULL) && (array->count <= array->capacity) && (objectIndex <= array->count) && (newObject != NULL));
+    if(!((array != NULL) && (array->objects != NULL) && (objectIndex <= array->count) && (newObject != NULL))) { [newObject autorelease]; return; }
+    if((array->count + 1UL) >= array->capacity) {
+        id *newObjects = NULL;
+        if((newObjects = (id *)realloc(array->objects, sizeof(id) * (array->capacity + 16UL))) == NULL) { [NSException raise:NSMallocException format:@"Unable to resize objects array."]; }
+        array->objects = newObjects;
+        array->capacity += 16UL;
+        memset(&array->objects[array->count], 0, sizeof(id) * (array->capacity - array->count));
+    }
+    array->count++;
+    if((objectIndex + 1UL) < array->count) { memmove(&array->objects[objectIndex + 1UL], &array->objects[objectIndex], sizeof(id) * ((array->count - 1UL) - objectIndex)); array->objects[objectIndex] = NULL; }
+    array->objects[objectIndex] = newObject;
 }
 
 // Note: The caller is responsible for -retaining the object that is to be added.
 static void _JKArrayReplaceObjectAtIndexWithObject(JKArray *array, NSUInteger objectIndex, id newObject) {
-  NSCParameterAssert((array != NULL) && (array->objects != NULL) && (array->count <= array->capacity) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL) && (newObject != NULL));
-  if(!((array != NULL) && (array->objects != NULL) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL) && (newObject != NULL))) { [newObject autorelease]; return; }
-  CFRelease(array->objects[objectIndex]);
-  array->objects[objectIndex] = NULL;
-  array->objects[objectIndex] = newObject;
+    NSCParameterAssert((array != NULL) && (array->objects != NULL) && (array->count <= array->capacity) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL) && (newObject != NULL));
+    if(!((array != NULL) && (array->objects != NULL) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL) && (newObject != NULL))) { [newObject autorelease]; return; }
+    CFRelease(array->objects[objectIndex]);
+    array->objects[objectIndex] = NULL;
+    array->objects[objectIndex] = newObject;
 }
 
 static void _JKArrayRemoveObjectAtIndex(JKArray *array, NSUInteger objectIndex) {
-  NSCParameterAssert((array != NULL) && (array->objects != NULL) && (array->count > 0UL) && (array->count <= array->capacity) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL));
-  if(!((array != NULL) && (array->objects != NULL) && (array->count > 0UL) && (array->count <= array->capacity) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL))) { return; }
-  CFRelease(array->objects[objectIndex]);
-  array->objects[objectIndex] = NULL;
-  if((objectIndex + 1UL) < array->count) { memmove(&array->objects[objectIndex], &array->objects[objectIndex + 1UL], sizeof(id) * ((array->count - 1UL) - objectIndex)); array->objects[array->count - 1UL] = NULL; }
-  array->count--;
+    NSCParameterAssert((array != NULL) && (array->objects != NULL) && (array->count > 0UL) && (array->count <= array->capacity) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL));
+    if(!((array != NULL) && (array->objects != NULL) && (array->count > 0UL) && (array->count <= array->capacity) && (objectIndex < array->count) && (array->objects[objectIndex] != NULL))) { return; }
+    CFRelease(array->objects[objectIndex]);
+    array->objects[objectIndex] = NULL;
+    if((objectIndex + 1UL) < array->count) { memmove(&array->objects[objectIndex], &array->objects[objectIndex + 1UL], sizeof(id) * ((array->count - 1UL) - objectIndex)); array->objects[array->count - 1UL] = NULL; }
+    array->count--;
 }
 
 - (void)dealloc
 {
-  if(JK_EXPECT_T(objects != NULL)) {
-    NSUInteger atObject = 0UL;
-    for(atObject = 0UL; atObject < count; atObject++) { if(JK_EXPECT_T(objects[atObject] != NULL)) { CFRelease(objects[atObject]); objects[atObject] = NULL; } }
-    free(objects); objects = NULL;
-  }
-  
-  [super dealloc];
+    if(JK_EXPECT_T(objects != NULL)) {
+        NSUInteger atObject = 0UL;
+        for(atObject = 0UL; atObject < count; atObject++) { if(JK_EXPECT_T(objects[atObject] != NULL)) { CFRelease(objects[atObject]); objects[atObject] = NULL; } }
+        free(objects); objects = NULL;
+    }
+    
+    [super dealloc];
 }
 
 - (NSUInteger)count
 {
-  NSParameterAssert((objects != NULL) && (count <= capacity));
-  return(count);
+    NSParameterAssert((objects != NULL) && (count <= capacity));
+    return(count);
 }
 
 - (void)getObjects:(id *)objectsPtr range:(NSRange)range
 {
-  NSParameterAssert((objects != NULL) && (count <= capacity));
-  if((objectsPtr     == NULL)  && (NSMaxRange(range) > 0UL))   { [NSException raise:NSRangeException format:@"*** -[%@ %@]: pointer to objects array is NULL but range length is %lu", NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)NSMaxRange(range)];        }
-  if((range.location >  count) || (NSMaxRange(range) > count)) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",                          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)NSMaxRange(range), (unsigned long)count]; }
+    NSParameterAssert((objects != NULL) && (count <= capacity));
+    if((objectsPtr     == NULL)  && (NSMaxRange(range) > 0UL))   { [NSException raise:NSRangeException format:@"*** -[%@ %@]: pointer to objects array is NULL but range length is %lu", NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)NSMaxRange(range)];        }
+    if((range.location >  count) || (NSMaxRange(range) > count)) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",                          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)NSMaxRange(range), (unsigned long)count]; }
 #ifndef __clang_analyzer__
-  memcpy(objectsPtr, objects + range.location, range.length * sizeof(id));
+    memcpy(objectsPtr, objects + range.location, range.length * sizeof(id));
 #endif
 }
 
 - (id)objectAtIndex:(NSUInteger)objectIndex
 {
-  if(objectIndex >= count) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)", NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)count]; }
-  NSParameterAssert((objects != NULL) && (count <= capacity) && (objects[objectIndex] != NULL));
-  return(objects[objectIndex]);
+    if(objectIndex >= count) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)", NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)count]; }
+    NSParameterAssert((objects != NULL) && (count <= capacity) && (objects[objectIndex] != NULL));
+    return(objects[objectIndex]);
 }
 
 - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len
 {
-  NSParameterAssert((state != NULL) && (stackbuf != NULL) && (len > 0UL) && (objects != NULL) && (count <= capacity));
-  if(JK_EXPECT_F(state->state == 0UL))   { state->mutationsPtr = (unsigned long *)&mutations; state->itemsPtr = stackbuf; }
-  if(JK_EXPECT_F(state->state >= count)) { return(0UL); }
-  
-  NSUInteger enumeratedCount  = 0UL;
-  while(JK_EXPECT_T(enumeratedCount < len) && JK_EXPECT_T(state->state < count)) { NSParameterAssert(objects[state->state] != NULL); stackbuf[enumeratedCount++] = objects[state->state++]; }
-  
-  return(enumeratedCount);
+    NSParameterAssert((state != NULL) && (stackbuf != NULL) && (len > 0UL) && (objects != NULL) && (count <= capacity));
+    if(JK_EXPECT_F(state->state == 0UL))   { state->mutationsPtr = (unsigned long *)&mutations; state->itemsPtr = stackbuf; }
+    if(JK_EXPECT_F(state->state >= count)) { return(0UL); }
+    
+    NSUInteger enumeratedCount  = 0UL;
+    while(JK_EXPECT_T(enumeratedCount < len) && JK_EXPECT_T(state->state < count)) { NSParameterAssert(objects[state->state] != NULL); stackbuf[enumeratedCount++] = objects[state->state++]; }
+    
+    return(enumeratedCount);
 }
 
 - (void)insertObject:(id)anObject atIndex:(NSUInteger)objectIndex
 {
-  if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(anObject    == NULL)  { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil",                    NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(objectIndex >  count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)(count + 1UL)]; }
+    if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
+    if(anObject    == NULL)  { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil",                    NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
+    if(objectIndex >  count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)(count + 1UL)]; }
 #ifdef __clang_analyzer__
-  [anObject retain]; // Stupid clang analyzer...  Issue #19.
+    [anObject retain]; // Stupid clang analyzer...  Issue #19.
 #else
-  anObject = [anObject retain];
+    anObject = [anObject retain];
 #endif
-  _JKArrayInsertObjectAtIndex(self, anObject, objectIndex);
-  mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
+    _JKArrayInsertObjectAtIndex(self, anObject, objectIndex);
+    mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
 }
 
 - (void)removeObjectAtIndex:(NSUInteger)objectIndex
 {
-  if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)count]; }
-  _JKArrayRemoveObjectAtIndex(self, objectIndex);
-  mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
+    if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
+    if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)count]; }
+    _JKArrayRemoveObjectAtIndex(self, objectIndex);
+    mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
 }
 
 - (void)replaceObjectAtIndex:(NSUInteger)objectIndex withObject:(id)anObject
 {
-  if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(anObject    == NULL)  { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil",                    NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)count]; }
+    if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
+    if(anObject    == NULL)  { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil",                    NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
+    if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), (unsigned long)objectIndex, (unsigned long)count]; }
 #ifdef __clang_analyzer__
-  [anObject retain]; // Stupid clang analyzer...  Issue #19.
+    [anObject retain]; // Stupid clang analyzer...  Issue #19.
 #else
-  anObject = [anObject retain];
+    anObject = [anObject retain];
 #endif
-  _JKArrayReplaceObjectAtIndexWithObject(self, objectIndex, anObject);
-  mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
+    _JKArrayReplaceObjectAtIndexWithObject(self, objectIndex, anObject);
+    mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
 }
 
 - (id)copyWithZone:(NSZone *)zone
 {
-  NSParameterAssert((objects != NULL) && (count <= capacity));
-  return((mutations == 0UL) ? [self retain] : [(NSArray *)[NSArray allocWithZone:zone] initWithObjects:objects count:count]);
+    NSParameterAssert((objects != NULL) && (count <= capacity));
+    return((mutations == 0UL) ? [self retain] : [(NSArray *)[NSArray allocWithZone:zone] initWithObjects:objects count:count]);
 }
 
 - (id)mutableCopyWithZone:(NSZone *)zone
 {
-  NSParameterAssert((objects != NULL) && (count <= capacity));
-  return([(NSMutableArray *)[NSMutableArray allocWithZone:zone] initWithObjects:objects count:count]);
+    NSParameterAssert((objects != NULL) && (count <= capacity));
+    return([(NSMutableArray *)[NSMutableArray allocWithZone:zone] initWithObjects:objects count:count]);
 }
 
 @end
@@ -821,8 +821,8 @@ - (id)mutableCopyWithZone:(NSZone *)zone
 
 #pragma mark -
 @interface JKDictionaryEnumerator : NSEnumerator {
-  id         collection;
-  NSUInteger nextObject;
+    id         collection;
+    NSUInteger nextObject;
 }
 
 - (id)initWithJKDictionary:(JKDictionary *)initDictionary;
@@ -835,47 +835,47 @@ @implementation JKDictionaryEnumerator
 
 - (id)initWithJKDictionary:(JKDictionary *)initDictionary
 {
-  NSParameterAssert(initDictionary != NULL);
-  if((self = [super init]) == NULL) { return(NULL); }
-  if((collection = (id)CFRetain(initDictionary)) == NULL) { [self autorelease]; return(NULL); }
-  return(self);
+    NSParameterAssert(initDictionary != NULL);
+    if((self = [super init]) == NULL) { return(NULL); }
+    if((collection = (id)CFRetain(initDictionary)) == NULL) { [self autorelease]; return(NULL); }
+    return(self);
 }
 
 - (void)dealloc
 {
-  if(collection != NULL) { CFRelease(collection); collection = NULL; }
-  [super dealloc];
+    if(collection != NULL) { CFRelease(collection); collection = NULL; }
+    [super dealloc];
 }
 
 - (NSArray *)allObjects
 {
-  NSParameterAssert(collection != NULL);
-  NSUInteger count = [(NSDictionary *)collection count], atObject = 0UL;
-  id         objects[count];
-
-  while((objects[atObject] = [self nextObject]) != NULL) { NSParameterAssert(atObject < count); atObject++; }
-
-  return([NSArray arrayWithObjects:objects count:atObject]);
+    NSParameterAssert(collection != NULL);
+    NSUInteger count = [(NSDictionary *)collection count], atObject = 0UL;
+    id         objects[count];
+    
+    while((objects[atObject] = [self nextObject]) != NULL) { NSParameterAssert(atObject < count); atObject++; }
+    
+    return([NSArray arrayWithObjects:objects count:atObject]);
 }
 
 - (id)nextObject
 {
-  NSParameterAssert((collection != NULL) && (_JKDictionaryHashEntry(collection) != NULL));
-  JKHashTableEntry *entry        = _JKDictionaryHashEntry(collection);
-  NSUInteger        capacity     = _JKDictionaryCapacity(collection);
-  id                returnObject = NULL;
-
-  if(entry != NULL) { while((nextObject < capacity) && ((returnObject = entry[nextObject++].key) == NULL)) { /* ... */ } }
-  
-  return(returnObject);
+    NSParameterAssert((collection != NULL) && (_JKDictionaryHashEntry(collection) != NULL));
+    JKHashTableEntry *entry        = _JKDictionaryHashEntry(collection);
+    NSUInteger        capacity     = _JKDictionaryCapacity(collection);
+    id                returnObject = NULL;
+    
+    if(entry != NULL) { while((nextObject < capacity) && ((returnObject = entry[nextObject++].key) == NULL)) { /* ... */ } }
+    
+    return(returnObject);
 }
 
 @end
 
 #pragma mark -
 @interface JKDictionary : NSMutableDictionary <NSCopying, NSMutableCopying, NSFastEnumeration> {
-  NSUInteger count, capacity, mutations;
-  JKHashTableEntry *entry;
+    NSUInteger count, capacity, mutations;
+    JKHashTableEntry *entry;
 }
 @end
 
@@ -884,224 +884,224 @@ @implementation JKDictionary
 + (id)allocWithZone:(NSZone *)zone
 {
 #pragma unused(zone)
-  [NSException raise:NSInvalidArgumentException format:@"*** - [%@ %@]: The %@ class is private to JSONKit and should not be used in this fashion.", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSStringFromClass([self class])];
-  return(NULL);
+    [NSException raise:NSInvalidArgumentException format:@"*** - [%@ %@]: The %@ class is private to JSONKit and should not be used in this fashion.", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSStringFromClass([self class])];
+    return(NULL);
 }
 
 // These values are taken from Core Foundation CF-550 CFBasicHash.m.  As a bonus, they align very well with our JKHashTableEntry struct too.
 static const NSUInteger jk_dictionaryCapacities[] = {
-  0UL, 3UL, 7UL, 13UL, 23UL, 41UL, 71UL, 127UL, 191UL, 251UL, 383UL, 631UL, 1087UL, 1723UL,
-  2803UL, 4523UL, 7351UL, 11959UL, 19447UL, 31231UL, 50683UL, 81919UL, 132607UL,
-  214519UL, 346607UL, 561109UL, 907759UL, 1468927UL, 2376191UL, 3845119UL,
-  6221311UL, 10066421UL, 16287743UL, 26354171UL, 42641881UL, 68996069UL,
-  111638519UL, 180634607UL, 292272623UL, 472907251UL
+    0UL, 3UL, 7UL, 13UL, 23UL, 41UL, 71UL, 127UL, 191UL, 251UL, 383UL, 631UL, 1087UL, 1723UL,
+    2803UL, 4523UL, 7351UL, 11959UL, 19447UL, 31231UL, 50683UL, 81919UL, 132607UL,
+    214519UL, 346607UL, 561109UL, 907759UL, 1468927UL, 2376191UL, 3845119UL,
+    6221311UL, 10066421UL, 16287743UL, 26354171UL, 42641881UL, 68996069UL,
+    111638519UL, 180634607UL, 292272623UL, 472907251UL
 };
 
 static NSUInteger _JKDictionaryCapacityForCount(NSUInteger count) {
-  NSUInteger bottom = 0UL, top = sizeof(jk_dictionaryCapacities) / sizeof(NSUInteger), mid = 0UL, tableSize = (NSUInteger)lround(floor(((double)count) * 1.33));
-  while(top > bottom) { mid = (top + bottom) / 2UL; if(jk_dictionaryCapacities[mid] < tableSize) { bottom = mid + 1UL; } else { top = mid; } }
-  return(jk_dictionaryCapacities[bottom]);
+    NSUInteger bottom = 0UL, top = sizeof(jk_dictionaryCapacities) / sizeof(NSUInteger), mid = 0UL, tableSize = (NSUInteger)lround(floor(((double)count) * 1.33));
+    while(top > bottom) { mid = (top + bottom) / 2UL; if(jk_dictionaryCapacities[mid] < tableSize) { bottom = mid + 1UL; } else { top = mid; } }
+    return(jk_dictionaryCapacities[bottom]);
 }
 
 static void _JKDictionaryResizeIfNeccessary(JKDictionary *dictionary) {
-  NSCParameterAssert((dictionary != NULL) && (dictionary->entry != NULL) && (dictionary->count <= dictionary->capacity));
-
-  NSUInteger capacityForCount = 0UL;
-  if(dictionary->capacity < (capacityForCount = _JKDictionaryCapacityForCount(dictionary->count + 1UL))) { // resize
-    NSUInteger        oldCapacity = dictionary->capacity;
+    NSCParameterAssert((dictionary != NULL) && (dictionary->entry != NULL) && (dictionary->count <= dictionary->capacity));
+    
+    NSUInteger capacityForCount = 0UL;
+    if(dictionary->capacity < (capacityForCount = _JKDictionaryCapacityForCount(dictionary->count + 1UL))) { // resize
+        NSUInteger        oldCapacity = dictionary->capacity;
 #ifndef NS_BLOCK_ASSERTIONS
-    NSUInteger oldCount = dictionary->count;
+        NSUInteger oldCount = dictionary->count;
 #endif
-    JKHashTableEntry *oldEntry    = dictionary->entry;
-    if(JK_EXPECT_F((dictionary->entry = (JKHashTableEntry *)calloc(1UL, sizeof(JKHashTableEntry) * capacityForCount)) == NULL)) { [NSException raise:NSMallocException format:@"Unable to allocate memory for hash table."]; }
-    dictionary->capacity = capacityForCount;
-    dictionary->count    = 0UL;
-    
-    NSUInteger idx = 0UL;
-    for(idx = 0UL; idx < oldCapacity; idx++) { if(oldEntry[idx].key != NULL) { _JKDictionaryAddObject(dictionary, oldEntry[idx].keyHash, oldEntry[idx].key, oldEntry[idx].object); oldEntry[idx].keyHash = 0UL; oldEntry[idx].key = NULL; oldEntry[idx].object = NULL; } }
-    NSCParameterAssert((oldCount == dictionary->count));
-    free(oldEntry); oldEntry = NULL;
-  }
+        JKHashTableEntry *oldEntry    = dictionary->entry;
+        if(JK_EXPECT_F((dictionary->entry = (JKHashTableEntry *)calloc(1UL, sizeof(JKHashTableEntry) * capacityForCount)) == NULL)) { [NSException raise:NSMallocException format:@"Unable to allocate memory for hash table."]; }
+        dictionary->capacity = capacityForCount;
+        dictionary->count    = 0UL;
+        
+        NSUInteger idx = 0UL;
+        for(idx = 0UL; idx < oldCapacity; idx++) { if(oldEntry[idx].key != NULL) { _JKDictionaryAddObject(dictionary, oldEntry[idx].keyHash, oldEntry[idx].key, oldEntry[idx].object); oldEntry[idx].keyHash = 0UL; oldEntry[idx].key = NULL; oldEntry[idx].object = NULL; } }
+        NSCParameterAssert((oldCount == dictionary->count));
+        free(oldEntry); oldEntry = NULL;
+    }
 }
 
 static JKDictionary *_JKDictionaryCreate(id *keys, NSUInteger *keyHashes, id *objects, NSUInteger count, BOOL mutableCollection) {
-  NSCParameterAssert((keys != NULL) && (keyHashes != NULL) && (objects != NULL) && (_JKDictionaryClass != NULL) && (_JKDictionaryInstanceSize > 0UL));
-  JKDictionary *dictionary = NULL;
-  if(JK_EXPECT_T((dictionary = (JKDictionary *)calloc(1UL, _JKDictionaryInstanceSize)) != NULL)) { // Directly allocate the JKDictionary instance via calloc.
-    object_setClass(dictionary, _JKDictionaryClass);
-    if((dictionary = [dictionary init]) == NULL) { return(NULL); }
-    dictionary->capacity = _JKDictionaryCapacityForCount(count);
-    dictionary->count    = 0UL;
-    
-    if(JK_EXPECT_F((dictionary->entry = (JKHashTableEntry *)calloc(1UL, sizeof(JKHashTableEntry) * dictionary->capacity)) == NULL)) { [dictionary autorelease]; return(NULL); }
-
-    NSUInteger idx = 0UL;
-    for(idx = 0UL; idx < count; idx++) { _JKDictionaryAddObject(dictionary, keyHashes[idx], keys[idx], objects[idx]); }
-
-    dictionary->mutations = (mutableCollection == NO) ? 0UL : 1UL;
-  }
-  return(dictionary);
+    NSCParameterAssert((keys != NULL) && (keyHashes != NULL) && (objects != NULL) && (_JKDictionaryClass != NULL) && (_JKDictionaryInstanceSize > 0UL));
+    JKDictionary *dictionary = NULL;
+    if(JK_EXPECT_T((dictionary = (JKDictionary *)calloc(1UL, _JKDictionaryInstanceSize)) != NULL)) { // Directly allocate the JKDictionary instance via calloc.
+        object_setClass(dictionary, _JKDictionaryClass);
+        if((dictionary = [dictionary init]) == NULL) { return(NULL); }
+        dictionary->capacity = _JKDictionaryCapacityForCount(count);
+        dictionary->count    = 0UL;
+        
+        if(JK_EXPECT_F((dictionary->entry = (JKHashTableEntry *)calloc(1UL, sizeof(JKHashTableEntry) * dictionary->capacity)) == NULL)) { [dictionary autorelease]; return(NULL); }
+        
+        NSUInteger idx = 0UL;
+        for(idx = 0UL; idx < count; idx++) { _JKDictionaryAddObject(dictionary, keyHashes[idx], keys[idx], objects[idx]); }
+        
+        dictionary->mutations = (mutableCollection == NO) ? 0UL : 1UL;
+    }
+    return(dictionary);
 }
 
 - (void)dealloc
 {
-  if(JK_EXPECT_T(entry != NULL)) {
-    NSUInteger atEntry = 0UL;
-    for(atEntry = 0UL; atEntry < capacity; atEntry++) {
-      if(JK_EXPECT_T(entry[atEntry].key    != NULL)) { CFRelease(entry[atEntry].key);    entry[atEntry].key    = NULL; }
-      if(JK_EXPECT_T(entry[atEntry].object != NULL)) { CFRelease(entry[atEntry].object); entry[atEntry].object = NULL; }
+    if(JK_EXPECT_T(entry != NULL)) {
+        NSUInteger atEntry = 0UL;
+        for(atEntry = 0UL; atEntry < capacity; atEntry++) {
+            if(JK_EXPECT_T(entry[atEntry].key    != NULL)) { CFRelease(entry[atEntry].key);    entry[atEntry].key    = NULL; }
+            if(JK_EXPECT_T(entry[atEntry].object != NULL)) { CFRelease(entry[atEntry].object); entry[atEntry].object = NULL; }
+        }
+        
+        free(entry); entry = NULL;
     }
-  
-    free(entry); entry = NULL;
-  }
-
-  [super dealloc];
+    
+    [super dealloc];
 }
 
 static JKHashTableEntry *_JKDictionaryHashEntry(JKDictionary *dictionary) {
-  NSCParameterAssert(dictionary != NULL);
-  return(dictionary->entry);
+    NSCParameterAssert(dictionary != NULL);
+    return(dictionary->entry);
 }
 
 static NSUInteger _JKDictionaryCapacity(JKDictionary *dictionary) {
-  NSCParameterAssert(dictionary != NULL);
-  return(dictionary->capacity);
+    NSCParameterAssert(dictionary != NULL);
+    return(dictionary->capacity);
 }
 
 static void _JKDictionaryRemoveObjectWithEntry(JKDictionary *dictionary, JKHashTableEntry *entry) {
-  NSCParameterAssert((dictionary != NULL) && (entry != NULL) && (entry->key != NULL) && (entry->object != NULL) && (dictionary->count > 0UL) && (dictionary->count <= dictionary->capacity));
-  CFRelease(entry->key);    entry->key    = NULL;
-  CFRelease(entry->object); entry->object = NULL;
-  entry->keyHash = 0UL;
-  dictionary->count--;
-  // In order for certain invariants that are used to speed up the search for a particular key, we need to "re-add" all the entries in the hash table following this entry until we hit a NULL entry.
-  NSUInteger removeIdx = entry - dictionary->entry, idx = 0UL;
-  NSCParameterAssert((removeIdx < dictionary->capacity));
-  for(idx = 0UL; idx < dictionary->capacity; idx++) {
-    NSUInteger entryIdx = (removeIdx + idx + 1UL) % dictionary->capacity;
-    JKHashTableEntry *atEntry = &dictionary->entry[entryIdx];
-    if(atEntry->key == NULL) { break; }
-    NSUInteger keyHash = atEntry->keyHash;
-    id key = atEntry->key, object = atEntry->object;
-    NSCParameterAssert(object != NULL);
-    atEntry->keyHash = 0UL;
-    atEntry->key     = NULL;
-    atEntry->object  = NULL;
-    NSUInteger addKeyEntry = keyHash % dictionary->capacity, addIdx = 0UL;
-    for(addIdx = 0UL; addIdx < dictionary->capacity; addIdx++) {
-      JKHashTableEntry *atAddEntry = &dictionary->entry[((addKeyEntry + addIdx) % dictionary->capacity)];
-      if(JK_EXPECT_T(atAddEntry->key == NULL)) { NSCParameterAssert((atAddEntry->keyHash == 0UL) && (atAddEntry->object == NULL)); atAddEntry->key = key; atAddEntry->object = object; atAddEntry->keyHash = keyHash; break; }
+    NSCParameterAssert((dictionary != NULL) && (entry != NULL) && (entry->key != NULL) && (entry->object != NULL) && (dictionary->count > 0UL) && (dictionary->count <= dictionary->capacity));
+    CFRelease(entry->key);    entry->key    = NULL;
+    CFRelease(entry->object); entry->object = NULL;
+    entry->keyHash = 0UL;
+    dictionary->count--;
+    // In order for certain invariants that are used to speed up the search for a particular key, we need to "re-add" all the entries in the hash table following this entry until we hit a NULL entry.
+    NSUInteger removeIdx = entry - dictionary->entry, idx = 0UL;
+    NSCParameterAssert((removeIdx < dictionary->capacity));
+    for(idx = 0UL; idx < dictionary->capacity; idx++) {
+        NSUInteger entryIdx = (removeIdx + idx + 1UL) % dictionary->capacity;
+        JKHashTableEntry *atEntry = &dictionary->entry[entryIdx];
+        if(atEntry->key == NULL) { break; }
+        NSUInteger keyHash = atEntry->keyHash;
+        id key = atEntry->key, object = atEntry->object;
+        NSCParameterAssert(object != NULL);
+        atEntry->keyHash = 0UL;
+        atEntry->key     = NULL;
+        atEntry->object  = NULL;
+        NSUInteger addKeyEntry = keyHash % dictionary->capacity, addIdx = 0UL;
+        for(addIdx = 0UL; addIdx < dictionary->capacity; addIdx++) {
+            JKHashTableEntry *atAddEntry = &dictionary->entry[((addKeyEntry + addIdx) % dictionary->capacity)];
+            if(JK_EXPECT_T(atAddEntry->key == NULL)) { NSCParameterAssert((atAddEntry->keyHash == 0UL) && (atAddEntry->object == NULL)); atAddEntry->key = key; atAddEntry->object = object; atAddEntry->keyHash = keyHash; break; }
+        }
     }
-  }
 }
 
 static void _JKDictionaryAddObject(JKDictionary *dictionary, NSUInteger keyHash, id key, id object) {
-  NSCParameterAssert((dictionary != NULL) && (key != NULL) && (object != NULL) && (dictionary->count < dictionary->capacity) && (dictionary->entry != NULL));
-  NSUInteger keyEntry = keyHash % dictionary->capacity, idx = 0UL;
-  for(idx = 0UL; idx < dictionary->capacity; idx++) {
-    NSUInteger entryIdx = (keyEntry + idx) % dictionary->capacity;
-    JKHashTableEntry *atEntry = &dictionary->entry[entryIdx];
-    if(JK_EXPECT_F(atEntry->keyHash == keyHash) && JK_EXPECT_T(atEntry->key != NULL) && (JK_EXPECT_F(key == atEntry->key) || JK_EXPECT_F(CFEqual(atEntry->key, key)))) { _JKDictionaryRemoveObjectWithEntry(dictionary, atEntry); }
-    if(JK_EXPECT_T(atEntry->key == NULL)) { NSCParameterAssert((atEntry->keyHash == 0UL) && (atEntry->object == NULL)); atEntry->key = key; atEntry->object = object; atEntry->keyHash = keyHash; dictionary->count++; return; }
-  }
-
-  // We should never get here.  If we do, we -release the key / object because it's our responsibility.
-  CFRelease(key);
-  CFRelease(object);
+    NSCParameterAssert((dictionary != NULL) && (key != NULL) && (object != NULL) && (dictionary->count < dictionary->capacity) && (dictionary->entry != NULL));
+    NSUInteger keyEntry = keyHash % dictionary->capacity, idx = 0UL;
+    for(idx = 0UL; idx < dictionary->capacity; idx++) {
+        NSUInteger entryIdx = (keyEntry + idx) % dictionary->capacity;
+        JKHashTableEntry *atEntry = &dictionary->entry[entryIdx];
+        if(JK_EXPECT_F(atEntry->keyHash == keyHash) && JK_EXPECT_T(atEntry->key != NULL) && (JK_EXPECT_F(key == atEntry->key) || JK_EXPECT_F(CFEqual(atEntry->key, key)))) { _JKDictionaryRemoveObjectWithEntry(dictionary, atEntry); }
+        if(JK_EXPECT_T(atEntry->key == NULL)) { NSCParameterAssert((atEntry->keyHash == 0UL) && (atEntry->object == NULL)); atEntry->key = key; atEntry->object = object; atEntry->keyHash = keyHash; dictionary->count++; return; }
+    }
+    
+    // We should never get here.  If we do, we -release the key / object because it's our responsibility.
+    CFRelease(key);
+    CFRelease(object);
 }
 
 - (NSUInteger)count
 {
-  return(count);
+    return(count);
 }
 
 static JKHashTableEntry *_JKDictionaryHashTableEntryForKey(JKDictionary *dictionary, id aKey) {
-  NSCParameterAssert((dictionary != NULL) && (dictionary->entry != NULL) && (dictionary->count <= dictionary->capacity));
-  if((aKey == NULL) || (dictionary->capacity == 0UL)) { return(NULL); }
-  NSUInteger        keyHash = CFHash(aKey), keyEntry = (keyHash % dictionary->capacity), idx = 0UL;
-  JKHashTableEntry *atEntry = NULL;
-  for(idx = 0UL; idx < dictionary->capacity; idx++) {
-    atEntry = &dictionary->entry[(keyEntry + idx) % dictionary->capacity];
-    if(JK_EXPECT_T(atEntry->keyHash == keyHash) && JK_EXPECT_T(atEntry->key != NULL) && ((atEntry->key == aKey) || CFEqual(atEntry->key, aKey))) { NSCParameterAssert(atEntry->object != NULL); return(atEntry); break; }
-    if(JK_EXPECT_F(atEntry->key == NULL)) { NSCParameterAssert(atEntry->object == NULL); return(NULL); break; } // If the key was in the table, we would have found it by now.
-  }
-  return(NULL);
+    NSCParameterAssert((dictionary != NULL) && (dictionary->entry != NULL) && (dictionary->count <= dictionary->capacity));
+    if((aKey == NULL) || (dictionary->capacity == 0UL)) { return(NULL); }
+    NSUInteger        keyHash = CFHash(aKey), keyEntry = (keyHash % dictionary->capacity), idx = 0UL;
+    JKHashTableEntry *atEntry = NULL;
+    for(idx = 0UL; idx < dictionary->capacity; idx++) {
+        atEntry = &dictionary->entry[(keyEntry + idx) % dictionary->capacity];
+        if(JK_EXPECT_T(atEntry->keyHash == keyHash) && JK_EXPECT_T(atEntry->key != NULL) && ((atEntry->key == aKey) || CFEqual(atEntry->key, aKey))) { NSCParameterAssert(atEntry->object != NULL); return(atEntry); break; }
+        if(JK_EXPECT_F(atEntry->key == NULL)) { NSCParameterAssert(atEntry->object == NULL); return(NULL); break; } // If the key was in the table, we would have found it by now.
+    }
+    return(NULL);
 }
 
 - (id)objectForKey:(id)aKey
 {
-  NSParameterAssert((entry != NULL) && (count <= capacity));
-  JKHashTableEntry *entryForKey = _JKDictionaryHashTableEntryForKey(self, aKey);
-  return((entryForKey != NULL) ? entryForKey->object : NULL);
+    NSParameterAssert((entry != NULL) && (count <= capacity));
+    JKHashTableEntry *entryForKey = _JKDictionaryHashTableEntryForKey(self, aKey);
+    return((entryForKey != NULL) ? entryForKey->object : NULL);
 }
 
 - (void)getObjects:(id *)objects andKeys:(id *)keys
 {
-  NSParameterAssert((entry != NULL) && (count <= capacity));
-  NSUInteger atEntry = 0UL; NSUInteger arrayIdx = 0UL;
-  for(atEntry = 0UL; atEntry < capacity; atEntry++) {
-    if(JK_EXPECT_T(entry[atEntry].key != NULL)) {
-      NSCParameterAssert((entry[atEntry].object != NULL) && (arrayIdx < count));
-      if(JK_EXPECT_T(keys    != NULL)) { keys[arrayIdx]    = entry[atEntry].key;    }
-      if(JK_EXPECT_T(objects != NULL)) { objects[arrayIdx] = entry[atEntry].object; }
-      arrayIdx++;
+    NSParameterAssert((entry != NULL) && (count <= capacity));
+    NSUInteger atEntry = 0UL; NSUInteger arrayIdx = 0UL;
+    for(atEntry = 0UL; atEntry < capacity; atEntry++) {
+        if(JK_EXPECT_T(entry[atEntry].key != NULL)) {
+            NSCParameterAssert((entry[atEntry].object != NULL) && (arrayIdx < count));
+            if(JK_EXPECT_T(keys    != NULL)) { keys[arrayIdx]    = entry[atEntry].key;    }
+            if(JK_EXPECT_T(objects != NULL)) { objects[arrayIdx] = entry[atEntry].object; }
+            arrayIdx++;
+        }
     }
-  }
 }
 
 - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len
 {
-  NSParameterAssert((state != NULL) && (stackbuf != NULL) && (len > 0UL) && (entry != NULL) && (count <= capacity));
-  if(JK_EXPECT_F(state->state == 0UL))      { state->mutationsPtr = (unsigned long *)&mutations; state->itemsPtr = stackbuf; }
-  if(JK_EXPECT_F(state->state >= capacity)) { return(0UL); }
-  
-  NSUInteger enumeratedCount  = 0UL;
-  while(JK_EXPECT_T(enumeratedCount < len) && JK_EXPECT_T(state->state < capacity)) { if(JK_EXPECT_T(entry[state->state].key != NULL)) { stackbuf[enumeratedCount++] = entry[state->state].key; } state->state++; }
+    NSParameterAssert((state != NULL) && (stackbuf != NULL) && (len > 0UL) && (entry != NULL) && (count <= capacity));
+    if(JK_EXPECT_F(state->state == 0UL))      { state->mutationsPtr = (unsigned long *)&mutations; state->itemsPtr = stackbuf; }
+    if(JK_EXPECT_F(state->state >= capacity)) { return(0UL); }
     
-  return(enumeratedCount);
+    NSUInteger enumeratedCount  = 0UL;
+    while(JK_EXPECT_T(enumeratedCount < len) && JK_EXPECT_T(state->state < capacity)) { if(JK_EXPECT_T(entry[state->state].key != NULL)) { stackbuf[enumeratedCount++] = entry[state->state].key; } state->state++; }
+    
+    return(enumeratedCount);
 }
 
 - (NSEnumerator *)keyEnumerator
 {
-  return([[[JKDictionaryEnumerator alloc] initWithJKDictionary:self] autorelease]);
+    return([[[JKDictionaryEnumerator alloc] initWithJKDictionary:self] autorelease]);
 }
 
 - (void)setObject:(id)anObject forKey:(id)aKey
 {
-  if(mutations == 0UL)  { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)];       }
-  if(aKey      == NULL) { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil key",                NSStringFromClass([self class]), NSStringFromSelector(_cmd)];       }
-  if(anObject  == NULL) { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil value (key: %@)",    NSStringFromClass([self class]), NSStringFromSelector(_cmd), aKey]; }
-  
-  _JKDictionaryResizeIfNeccessary(self);
+    if(mutations == 0UL)  { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)];       }
+    if(aKey      == NULL) { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil key",                NSStringFromClass([self class]), NSStringFromSelector(_cmd)];       }
+    if(anObject  == NULL) { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil value (key: %@)",    NSStringFromClass([self class]), NSStringFromSelector(_cmd), aKey]; }
+    
+    _JKDictionaryResizeIfNeccessary(self);
 #ifndef __clang_analyzer__
-  aKey     = [aKey     copy];   // Why on earth would clang complain that this -copy "might leak", 
-  anObject = [anObject retain]; // but this -retain doesn't!?
+    aKey     = [aKey     copy];   // Why on earth would clang complain that this -copy "might leak",
+    anObject = [anObject retain]; // but this -retain doesn't!?
 #endif // __clang_analyzer__
-  _JKDictionaryAddObject(self, CFHash(aKey), aKey, anObject);
-  mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
+    _JKDictionaryAddObject(self, CFHash(aKey), aKey, anObject);
+    mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
 }
 
 - (void)removeObjectForKey:(id)aKey
 {
-  if(mutations == 0UL)  { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(aKey      == NULL) { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to remove nil key",                NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  JKHashTableEntry *entryForKey = _JKDictionaryHashTableEntryForKey(self, aKey);
-  if(entryForKey != NULL) {
-    _JKDictionaryRemoveObjectWithEntry(self, entryForKey);
-    mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
-  }
+    if(mutations == 0UL)  { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
+    if(aKey      == NULL) { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to remove nil key",                NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
+    JKHashTableEntry *entryForKey = _JKDictionaryHashTableEntryForKey(self, aKey);
+    if(entryForKey != NULL) {
+        _JKDictionaryRemoveObjectWithEntry(self, entryForKey);
+        mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
+    }
 }
 
 - (id)copyWithZone:(NSZone *)zone
 {
-  NSParameterAssert((entry != NULL) && (count <= capacity));
-  return((mutations == 0UL) ? [self retain] : [[NSDictionary allocWithZone:zone] initWithDictionary:self]);
+    NSParameterAssert((entry != NULL) && (count <= capacity));
+    return((mutations == 0UL) ? [self retain] : [[NSDictionary allocWithZone:zone] initWithDictionary:self]);
 }
 
 - (id)mutableCopyWithZone:(NSZone *)zone
 {
-  NSParameterAssert((entry != NULL) && (count <= capacity));
-  return([[NSMutableDictionary allocWithZone:zone] initWithDictionary:self]);
+    NSParameterAssert((entry != NULL) && (count <= capacity));
+    return([[NSMutableDictionary allocWithZone:zone] initWithDictionary:self]);
 }
 
 @end
@@ -1117,174 +1117,174 @@ - (id)mutableCopyWithZone:(NSZone *)zone
 
 
 static void jk_error(JKParseState *parseState, NSString *format, ...) {
-  NSCParameterAssert((parseState != NULL) && (format != NULL));
-
-  va_list varArgsList;
-  va_start(varArgsList, format);
-  NSString *formatString = [[[NSString alloc] initWithFormat:format arguments:varArgsList] autorelease];
-  va_end(varArgsList);
-
+    NSCParameterAssert((parseState != NULL) && (format != NULL));
+    
+    va_list varArgsList;
+    va_start(varArgsList, format);
+    NSString *formatString = [[[NSString alloc] initWithFormat:format arguments:varArgsList] autorelease];
+    va_end(varArgsList);
+    
 #if 0
-  const unsigned char *lineStart      = parseState->stringBuffer.bytes.ptr + parseState->lineStartIndex;
-  const unsigned char *lineEnd        = lineStart;
-  const unsigned char *atCharacterPtr = NULL;
-
-  for(atCharacterPtr = lineStart; atCharacterPtr < JK_END_STRING_PTR(parseState); atCharacterPtr++) { lineEnd = atCharacterPtr; if(jk_parse_is_newline(parseState, atCharacterPtr)) { break; } }
-
-  NSString *lineString = @"", *carretString = @"";
-  if(lineStart < JK_END_STRING_PTR(parseState)) {
-    lineString   = [[[NSString alloc] initWithBytes:lineStart length:(lineEnd - lineStart) encoding:NSUTF8StringEncoding] autorelease];
-    carretString = [NSString stringWithFormat:@"%*.*s^", (int)(parseState->atIndex - parseState->lineStartIndex), (int)(parseState->atIndex - parseState->lineStartIndex), " "];
-  }
+    const unsigned char *lineStart      = parseState->stringBuffer.bytes.ptr + parseState->lineStartIndex;
+    const unsigned char *lineEnd        = lineStart;
+    const unsigned char *atCharacterPtr = NULL;
+    
+    for(atCharacterPtr = lineStart; atCharacterPtr < JK_END_STRING_PTR(parseState); atCharacterPtr++) { lineEnd = atCharacterPtr; if(jk_parse_is_newline(parseState, atCharacterPtr)) { break; } }
+    
+    NSString *lineString = @"", *carretString = @"";
+    if(lineStart < JK_END_STRING_PTR(parseState)) {
+        lineString   = [[[NSString alloc] initWithBytes:lineStart length:(lineEnd - lineStart) encoding:NSUTF8StringEncoding] autorelease];
+        carretString = [NSString stringWithFormat:@"%*.*s^", (int)(parseState->atIndex - parseState->lineStartIndex), (int)(parseState->atIndex - parseState->lineStartIndex), " "];
+    }
 #endif
-
-  if(parseState->error == NULL) {
-    parseState->error = [NSError errorWithDomain:@"JKErrorDomain" code:-1L userInfo:
-                                   [NSDictionary dictionaryWithObjectsAndKeys:
-                                                                              formatString,                                             NSLocalizedDescriptionKey,
-                                                                              [NSNumber numberWithUnsignedLong:parseState->atIndex],    @"JKAtIndexKey",
-                                                                              [NSNumber numberWithUnsignedLong:parseState->lineNumber], @"JKLineNumberKey",
-                                                 //lineString,   @"JKErrorLine0Key",
-                                                 //carretString, @"JKErrorLine1Key",
-                                                                              NULL]];
-  }
+    
+    if(parseState->error == NULL) {
+        parseState->error = [NSError errorWithDomain:@"JKErrorDomain" code:-1L userInfo:
+                             [NSDictionary dictionaryWithObjectsAndKeys:
+                              formatString,                                             NSLocalizedDescriptionKey,
+                              [NSNumber numberWithUnsignedLong:parseState->atIndex],    @"JKAtIndexKey",
+                              [NSNumber numberWithUnsignedLong:parseState->lineNumber], @"JKLineNumberKey",
+                              //lineString,   @"JKErrorLine0Key",
+                              //carretString, @"JKErrorLine1Key",
+                              NULL]];
+    }
 }
 
 #pragma mark -
 #pragma mark Buffer and Object Stack management functions
 
 static void jk_managedBuffer_release(JKManagedBuffer *managedBuffer) {
-  if((managedBuffer->flags & JKManagedBufferMustFree)) {
-    if(managedBuffer->bytes.ptr != NULL) { free(managedBuffer->bytes.ptr); managedBuffer->bytes.ptr = NULL; }
-    managedBuffer->flags &= ~JKManagedBufferMustFree;
-  }
-
-  managedBuffer->bytes.ptr     = NULL;
-  managedBuffer->bytes.length  = 0UL;
-  managedBuffer->flags        &= ~JKManagedBufferLocationMask;
+    if((managedBuffer->flags & JKManagedBufferMustFree)) {
+        if(managedBuffer->bytes.ptr != NULL) { free(managedBuffer->bytes.ptr); managedBuffer->bytes.ptr = NULL; }
+        managedBuffer->flags &= ~JKManagedBufferMustFree;
+    }
+    
+    managedBuffer->bytes.ptr     = NULL;
+    managedBuffer->bytes.length  = 0UL;
+    managedBuffer->flags        &= ~JKManagedBufferLocationMask;
 }
 
 static void jk_managedBuffer_setToStackBuffer(JKManagedBuffer *managedBuffer, unsigned char *ptr, size_t length) {
-  jk_managedBuffer_release(managedBuffer);
-  managedBuffer->bytes.ptr     = ptr;
-  managedBuffer->bytes.length  = length;
-  managedBuffer->flags         = (managedBuffer->flags & ~JKManagedBufferLocationMask) | JKManagedBufferOnStack;
+    jk_managedBuffer_release(managedBuffer);
+    managedBuffer->bytes.ptr     = ptr;
+    managedBuffer->bytes.length  = length;
+    managedBuffer->flags         = (managedBuffer->flags & ~JKManagedBufferLocationMask) | JKManagedBufferOnStack;
 }
 
 static unsigned char *jk_managedBuffer_resize(JKManagedBuffer *managedBuffer, size_t newSize) {
-  size_t roundedUpNewSize = newSize;
-
-  if(managedBuffer->roundSizeUpToMultipleOf > 0UL) { roundedUpNewSize = newSize + ((managedBuffer->roundSizeUpToMultipleOf - (newSize % managedBuffer->roundSizeUpToMultipleOf)) % managedBuffer->roundSizeUpToMultipleOf); }
-
-  if((roundedUpNewSize != managedBuffer->bytes.length) && (roundedUpNewSize > managedBuffer->bytes.length)) {
-    if((managedBuffer->flags & JKManagedBufferLocationMask) == JKManagedBufferOnStack) {
-      NSCParameterAssert((managedBuffer->flags & JKManagedBufferMustFree) == 0);
-      unsigned char *newBuffer = NULL, *oldBuffer = managedBuffer->bytes.ptr;
-      
-      if((newBuffer = (unsigned char *)malloc(roundedUpNewSize)) == NULL) { return(NULL); }
-      memcpy(newBuffer, oldBuffer, jk_min(managedBuffer->bytes.length, roundedUpNewSize));
-      managedBuffer->flags        = (managedBuffer->flags & ~JKManagedBufferLocationMask) | (JKManagedBufferOnHeap | JKManagedBufferMustFree);
-      managedBuffer->bytes.ptr    = newBuffer;
-      managedBuffer->bytes.length = roundedUpNewSize;
-    } else {
-      NSCParameterAssert(((managedBuffer->flags & JKManagedBufferMustFree) != 0) && ((managedBuffer->flags & JKManagedBufferLocationMask) == JKManagedBufferOnHeap));
-      if((managedBuffer->bytes.ptr = (unsigned char *)reallocf(managedBuffer->bytes.ptr, roundedUpNewSize)) == NULL) { return(NULL); }
-      managedBuffer->bytes.length = roundedUpNewSize;
+    size_t roundedUpNewSize = newSize;
+    
+    if(managedBuffer->roundSizeUpToMultipleOf > 0UL) { roundedUpNewSize = newSize + ((managedBuffer->roundSizeUpToMultipleOf - (newSize % managedBuffer->roundSizeUpToMultipleOf)) % managedBuffer->roundSizeUpToMultipleOf); }
+    
+    if((roundedUpNewSize != managedBuffer->bytes.length) && (roundedUpNewSize > managedBuffer->bytes.length)) {
+        if((managedBuffer->flags & JKManagedBufferLocationMask) == JKManagedBufferOnStack) {
+            NSCParameterAssert((managedBuffer->flags & JKManagedBufferMustFree) == 0);
+            unsigned char *newBuffer = NULL, *oldBuffer = managedBuffer->bytes.ptr;
+            
+            if((newBuffer = (unsigned char *)malloc(roundedUpNewSize)) == NULL) { return(NULL); }
+            memcpy(newBuffer, oldBuffer, jk_min(managedBuffer->bytes.length, roundedUpNewSize));
+            managedBuffer->flags        = (managedBuffer->flags & ~JKManagedBufferLocationMask) | (JKManagedBufferOnHeap | JKManagedBufferMustFree);
+            managedBuffer->bytes.ptr    = newBuffer;
+            managedBuffer->bytes.length = roundedUpNewSize;
+        } else {
+            NSCParameterAssert(((managedBuffer->flags & JKManagedBufferMustFree) != 0) && ((managedBuffer->flags & JKManagedBufferLocationMask) == JKManagedBufferOnHeap));
+            if((managedBuffer->bytes.ptr = (unsigned char *)reallocf(managedBuffer->bytes.ptr, roundedUpNewSize)) == NULL) { return(NULL); }
+            managedBuffer->bytes.length = roundedUpNewSize;
+        }
     }
-  }
-
-  return(managedBuffer->bytes.ptr);
+    
+    return(managedBuffer->bytes.ptr);
 }
 
 
 
 static void jk_objectStack_release(JKObjectStack *objectStack) {
-  NSCParameterAssert(objectStack != NULL);
-
-  NSCParameterAssert(objectStack->index <= objectStack->count);
-  size_t atIndex = 0UL;
-  for(atIndex = 0UL; atIndex < objectStack->index; atIndex++) {
-    if(objectStack->objects[atIndex] != NULL) { CFRelease(objectStack->objects[atIndex]); objectStack->objects[atIndex] = NULL; }
-    if(objectStack->keys[atIndex]    != NULL) { CFRelease(objectStack->keys[atIndex]);    objectStack->keys[atIndex]    = NULL; }
-  }
-  objectStack->index = 0UL;
-
-  if(objectStack->flags & JKObjectStackMustFree) {
-    NSCParameterAssert((objectStack->flags & JKObjectStackLocationMask) == JKObjectStackOnHeap);
-    if(objectStack->objects  != NULL) { free(objectStack->objects);  objectStack->objects  = NULL; }
-    if(objectStack->keys     != NULL) { free(objectStack->keys);     objectStack->keys     = NULL; }
-    if(objectStack->cfHashes != NULL) { free(objectStack->cfHashes); objectStack->cfHashes = NULL; }
-    objectStack->flags &= ~JKObjectStackMustFree;
-  }
-
-  objectStack->objects  = NULL;
-  objectStack->keys     = NULL;
-  objectStack->cfHashes = NULL;
-
-  objectStack->count    = 0UL;
-  objectStack->flags   &= ~JKObjectStackLocationMask;
+    NSCParameterAssert(objectStack != NULL);
+    
+    NSCParameterAssert(objectStack->index <= objectStack->count);
+    size_t atIndex = 0UL;
+    for(atIndex = 0UL; atIndex < objectStack->index; atIndex++) {
+        if(objectStack->objects[atIndex] != NULL) { CFRelease(objectStack->objects[atIndex]); objectStack->objects[atIndex] = NULL; }
+        if(objectStack->keys[atIndex]    != NULL) { CFRelease(objectStack->keys[atIndex]);    objectStack->keys[atIndex]    = NULL; }
+    }
+    objectStack->index = 0UL;
+    
+    if(objectStack->flags & JKObjectStackMustFree) {
+        NSCParameterAssert((objectStack->flags & JKObjectStackLocationMask) == JKObjectStackOnHeap);
+        if(objectStack->objects  != NULL) { free(objectStack->objects);  objectStack->objects  = NULL; }
+        if(objectStack->keys     != NULL) { free(objectStack->keys);     objectStack->keys     = NULL; }
+        if(objectStack->cfHashes != NULL) { free(objectStack->cfHashes); objectStack->cfHashes = NULL; }
+        objectStack->flags &= ~JKObjectStackMustFree;
+    }
+    
+    objectStack->objects  = NULL;
+    objectStack->keys     = NULL;
+    objectStack->cfHashes = NULL;
+    
+    objectStack->count    = 0UL;
+    objectStack->flags   &= ~JKObjectStackLocationMask;
 }
 
 static void jk_objectStack_setToStackBuffer(JKObjectStack *objectStack, void **objects, void **keys, CFHashCode *cfHashes, size_t count) {
-  NSCParameterAssert((objectStack != NULL) && (objects != NULL) && (keys != NULL) && (cfHashes != NULL) && (count > 0UL));
-  jk_objectStack_release(objectStack);
-  objectStack->objects  = objects;
-  objectStack->keys     = keys;
-  objectStack->cfHashes = cfHashes;
-  objectStack->count    = count;
-  objectStack->flags    = (objectStack->flags & ~JKObjectStackLocationMask) | JKObjectStackOnStack;
+    NSCParameterAssert((objectStack != NULL) && (objects != NULL) && (keys != NULL) && (cfHashes != NULL) && (count > 0UL));
+    jk_objectStack_release(objectStack);
+    objectStack->objects  = objects;
+    objectStack->keys     = keys;
+    objectStack->cfHashes = cfHashes;
+    objectStack->count    = count;
+    objectStack->flags    = (objectStack->flags & ~JKObjectStackLocationMask) | JKObjectStackOnStack;
 #ifndef NS_BLOCK_ASSERTIONS
-  size_t idx;
-  for(idx = 0UL; idx < objectStack->count; idx++) { objectStack->objects[idx] = NULL; objectStack->keys[idx] = NULL; objectStack->cfHashes[idx] = 0UL; }
+    size_t idx;
+    for(idx = 0UL; idx < objectStack->count; idx++) { objectStack->objects[idx] = NULL; objectStack->keys[idx] = NULL; objectStack->cfHashes[idx] = 0UL; }
 #endif
 }
 
 static int jk_objectStack_resize(JKObjectStack *objectStack, size_t newCount) {
-  size_t roundedUpNewCount = newCount;
-  int    returnCode = 0;
-
-  void       **newObjects  = NULL, **newKeys = NULL;
-  CFHashCode  *newCFHashes = NULL;
-
-  if(objectStack->roundSizeUpToMultipleOf > 0UL) { roundedUpNewCount = newCount + ((objectStack->roundSizeUpToMultipleOf - (newCount % objectStack->roundSizeUpToMultipleOf)) % objectStack->roundSizeUpToMultipleOf); }
-
-  if((roundedUpNewCount != objectStack->count) && (roundedUpNewCount > objectStack->count)) {
-    if((objectStack->flags & JKObjectStackLocationMask) == JKObjectStackOnStack) {
-      NSCParameterAssert((objectStack->flags & JKObjectStackMustFree) == 0);
-
-      if((newObjects  = (void **     )calloc(1UL, roundedUpNewCount * sizeof(void *    ))) == NULL) { returnCode = 1; goto errorExit; }
-      memcpy(newObjects, objectStack->objects,   jk_min(objectStack->count, roundedUpNewCount) * sizeof(void *));
-      if((newKeys     = (void **     )calloc(1UL, roundedUpNewCount * sizeof(void *    ))) == NULL) { returnCode = 1; goto errorExit; }
-      memcpy(newKeys,     objectStack->keys,     jk_min(objectStack->count, roundedUpNewCount) * sizeof(void *));
-
-      if((newCFHashes = (CFHashCode *)calloc(1UL, roundedUpNewCount * sizeof(CFHashCode))) == NULL) { returnCode = 1; goto errorExit; }
-      memcpy(newCFHashes, objectStack->cfHashes, jk_min(objectStack->count, roundedUpNewCount) * sizeof(CFHashCode));
-
-      objectStack->flags    = (objectStack->flags & ~JKObjectStackLocationMask) | (JKObjectStackOnHeap | JKObjectStackMustFree);
-      objectStack->objects  = newObjects;  newObjects  = NULL;
-      objectStack->keys     = newKeys;     newKeys     = NULL;
-      objectStack->cfHashes = newCFHashes; newCFHashes = NULL;
-      objectStack->count    = roundedUpNewCount;
-    } else {
-      NSCParameterAssert(((objectStack->flags & JKObjectStackMustFree) != 0) && ((objectStack->flags & JKObjectStackLocationMask) == JKObjectStackOnHeap));
-      if((newObjects  = (void  **    )realloc(objectStack->objects,  roundedUpNewCount * sizeof(void *    ))) != NULL) { objectStack->objects  = newObjects;  newObjects  = NULL; } else { returnCode = 1; goto errorExit; }
-      if((newKeys     = (void  **    )realloc(objectStack->keys,     roundedUpNewCount * sizeof(void *    ))) != NULL) { objectStack->keys     = newKeys;     newKeys     = NULL; } else { returnCode = 1; goto errorExit; }
-      if((newCFHashes = (CFHashCode *)realloc(objectStack->cfHashes, roundedUpNewCount * sizeof(CFHashCode))) != NULL) { objectStack->cfHashes = newCFHashes; newCFHashes = NULL; } else { returnCode = 1; goto errorExit; }
-
+    size_t roundedUpNewCount = newCount;
+    int    returnCode = 0;
+    
+    void       **newObjects  = NULL, **newKeys = NULL;
+    CFHashCode  *newCFHashes = NULL;
+    
+    if(objectStack->roundSizeUpToMultipleOf > 0UL) { roundedUpNewCount = newCount + ((objectStack->roundSizeUpToMultipleOf - (newCount % objectStack->roundSizeUpToMultipleOf)) % objectStack->roundSizeUpToMultipleOf); }
+    
+    if((roundedUpNewCount != objectStack->count) && (roundedUpNewCount > objectStack->count)) {
+        if((objectStack->flags & JKObjectStackLocationMask) == JKObjectStackOnStack) {
+            NSCParameterAssert((objectStack->flags & JKObjectStackMustFree) == 0);
+            
+            if((newObjects  = (void **     )calloc(1UL, roundedUpNewCount * sizeof(void *    ))) == NULL) { returnCode = 1; goto errorExit; }
+            memcpy(newObjects, objectStack->objects,   jk_min(objectStack->count, roundedUpNewCount) * sizeof(void *));
+            if((newKeys     = (void **     )calloc(1UL, roundedUpNewCount * sizeof(void *    ))) == NULL) { returnCode = 1; goto errorExit; }
+            memcpy(newKeys,     objectStack->keys,     jk_min(objectStack->count, roundedUpNewCount) * sizeof(void *));
+            
+            if((newCFHashes = (CFHashCode *)calloc(1UL, roundedUpNewCount * sizeof(CFHashCode))) == NULL) { returnCode = 1; goto errorExit; }
+            memcpy(newCFHashes, objectStack->cfHashes, jk_min(objectStack->count, roundedUpNewCount) * sizeof(CFHashCode));
+            
+            objectStack->flags    = (objectStack->flags & ~JKObjectStackLocationMask) | (JKObjectStackOnHeap | JKObjectStackMustFree);
+            objectStack->objects  = newObjects;  newObjects  = NULL;
+            objectStack->keys     = newKeys;     newKeys     = NULL;
+            objectStack->cfHashes = newCFHashes; newCFHashes = NULL;
+            objectStack->count    = roundedUpNewCount;
+        } else {
+            NSCParameterAssert(((objectStack->flags & JKObjectStackMustFree) != 0) && ((objectStack->flags & JKObjectStackLocationMask) == JKObjectStackOnHeap));
+            if((newObjects  = (void  **    )realloc(objectStack->objects,  roundedUpNewCount * sizeof(void *    ))) != NULL) { objectStack->objects  = newObjects;  newObjects  = NULL; } else { returnCode = 1; goto errorExit; }
+            if((newKeys     = (void  **    )realloc(objectStack->keys,     roundedUpNewCount * sizeof(void *    ))) != NULL) { objectStack->keys     = newKeys;     newKeys     = NULL; } else { returnCode = 1; goto errorExit; }
+            if((newCFHashes = (CFHashCode *)realloc(objectStack->cfHashes, roundedUpNewCount * sizeof(CFHashCode))) != NULL) { objectStack->cfHashes = newCFHashes; newCFHashes = NULL; } else { returnCode = 1; goto errorExit; }
+            
 #ifndef NS_BLOCK_ASSERTIONS
-      size_t idx;
-      for(idx = objectStack->count; idx < roundedUpNewCount; idx++) { objectStack->objects[idx] = NULL; objectStack->keys[idx] = NULL; objectStack->cfHashes[idx] = 0UL; }
+            size_t idx;
+            for(idx = objectStack->count; idx < roundedUpNewCount; idx++) { objectStack->objects[idx] = NULL; objectStack->keys[idx] = NULL; objectStack->cfHashes[idx] = 0UL; }
 #endif
-      objectStack->count = roundedUpNewCount;
+            objectStack->count = roundedUpNewCount;
+        }
     }
-  }
-
- errorExit:
-  if(newObjects  != NULL) { free(newObjects);  newObjects  = NULL; }
-  if(newKeys     != NULL) { free(newKeys);     newKeys     = NULL; }
-  if(newCFHashes != NULL) { free(newCFHashes); newCFHashes = NULL; }
-
-  return(returnCode);
+    
+errorExit:
+    if(newObjects  != NULL) { free(newObjects);  newObjects  = NULL; }
+    if(newKeys     != NULL) { free(newKeys);     newKeys     = NULL; }
+    if(newCFHashes != NULL) { free(newCFHashes); newCFHashes = NULL; }
+    
+    return(returnCode);
 }
 
 ////////////
@@ -1292,128 +1292,128 @@ static int jk_objectStack_resize(JKObjectStack *objectStack, size_t newCount) {
 #pragma mark Unicode related functions
 
 JK_STATIC_INLINE ConversionResult isValidCodePoint(UTF32 *u32CodePoint) {
-  ConversionResult result = conversionOK;
-  UTF32            ch     = *u32CodePoint;
-
-  if(JK_EXPECT_F(ch >= UNI_SUR_HIGH_START) && (JK_EXPECT_T(ch <= UNI_SUR_LOW_END)))                                                        { result = sourceIllegal; ch = UNI_REPLACEMENT_CHAR; goto finished; }
-  if(JK_EXPECT_F(ch >= 0xFDD0U) && (JK_EXPECT_F(ch <= 0xFDEFU) || JK_EXPECT_F((ch & 0xFFFEU) == 0xFFFEU)) && JK_EXPECT_T(ch <= 0x10FFFFU)) { result = sourceIllegal; ch = UNI_REPLACEMENT_CHAR; goto finished; }
-  if(JK_EXPECT_F(ch == 0U))                                                                                                                { result = sourceIllegal; ch = UNI_REPLACEMENT_CHAR; goto finished; }
-
- finished:
-  *u32CodePoint = ch;
-  return(result);
+    ConversionResult result = conversionOK;
+    UTF32            ch     = *u32CodePoint;
+    
+    if(JK_EXPECT_F(ch >= UNI_SUR_HIGH_START) && (JK_EXPECT_T(ch <= UNI_SUR_LOW_END)))                                                        { result = sourceIllegal; ch = UNI_REPLACEMENT_CHAR; goto finished; }
+    if(JK_EXPECT_F(ch >= 0xFDD0U) && (JK_EXPECT_F(ch <= 0xFDEFU) || JK_EXPECT_F((ch & 0xFFFEU) == 0xFFFEU)) && JK_EXPECT_T(ch <= 0x10FFFFU)) { result = sourceIllegal; ch = UNI_REPLACEMENT_CHAR; goto finished; }
+    if(JK_EXPECT_F(ch == 0U))                                                                                                                { result = sourceIllegal; ch = UNI_REPLACEMENT_CHAR; goto finished; }
+    
+finished:
+    *u32CodePoint = ch;
+    return(result);
 }
 
 
 static int isLegalUTF8(const UTF8 *source, size_t length) {
-  const UTF8 *srcptr = source + length;
-  UTF8 a;
-
-  switch(length) {
-    default: return(0); // Everything else falls through when "true"...
-    case 4: if(JK_EXPECT_F(((a = (*--srcptr)) < 0x80) || (a > 0xBF))) { return(0); }
-    case 3: if(JK_EXPECT_F(((a = (*--srcptr)) < 0x80) || (a > 0xBF))) { return(0); }
-    case 2: if(JK_EXPECT_F( (a = (*--srcptr)) > 0xBF               )) { return(0); }
-      
-      switch(*source) { // no fall-through in this inner switch
-        case 0xE0: if(JK_EXPECT_F(a < 0xA0)) { return(0); } break;
-        case 0xED: if(JK_EXPECT_F(a > 0x9F)) { return(0); } break;
-        case 0xF0: if(JK_EXPECT_F(a < 0x90)) { return(0); } break;
-        case 0xF4: if(JK_EXPECT_F(a > 0x8F)) { return(0); } break;
-        default:   if(JK_EXPECT_F(a < 0x80)) { return(0); }
-      }
-      
-    case 1: if(JK_EXPECT_F((JK_EXPECT_T(*source < 0xC2)) && JK_EXPECT_F(*source >= 0x80))) { return(0); }
-  }
-
-  if(JK_EXPECT_F(*source > 0xF4)) { return(0); }
-
-  return(1);
+    const UTF8 *srcptr = source + length;
+    UTF8 a;
+    
+    switch(length) {
+        default: return(0); // Everything else falls through when "true"...
+        case 4: if(JK_EXPECT_F(((a = (*--srcptr)) < 0x80) || (a > 0xBF))) { return(0); }
+        case 3: if(JK_EXPECT_F(((a = (*--srcptr)) < 0x80) || (a > 0xBF))) { return(0); }
+        case 2: if(JK_EXPECT_F( (a = (*--srcptr)) > 0xBF               )) { return(0); }
+            
+            switch(*source) { // no fall-through in this inner switch
+                case 0xE0: if(JK_EXPECT_F(a < 0xA0)) { return(0); } break;
+                case 0xED: if(JK_EXPECT_F(a > 0x9F)) { return(0); } break;
+                case 0xF0: if(JK_EXPECT_F(a < 0x90)) { return(0); } break;
+                case 0xF4: if(JK_EXPECT_F(a > 0x8F)) { return(0); } break;
+                default:   if(JK_EXPECT_F(a < 0x80)) { return(0); }
+            }
+            
+        case 1: if(JK_EXPECT_F((JK_EXPECT_T(*source < 0xC2)) && JK_EXPECT_F(*source >= 0x80))) { return(0); }
+    }
+    
+    if(JK_EXPECT_F(*source > 0xF4)) { return(0); }
+    
+    return(1);
 }
 
 static ConversionResult ConvertSingleCodePointInUTF8(const UTF8 *sourceStart, const UTF8 *sourceEnd, UTF8 const **nextUTF8, UTF32 *convertedUTF32) {
-  ConversionResult result = conversionOK;
-  const UTF8 *source = sourceStart;
-  UTF32 ch = 0UL;
-
+    ConversionResult result = conversionOK;
+    const UTF8 *source = sourceStart;
+    UTF32 ch = 0UL;
+    
 #if !defined(JK_FAST_TRAILING_BYTES)
-  unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+    unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
 #else
-  unsigned short extraBytesToRead = __builtin_clz(((*source)^0xff) << 25);
+    unsigned short extraBytesToRead = __builtin_clz(((*source)^0xff) << 25);
 #endif
-
-  if(JK_EXPECT_F((source + extraBytesToRead + 1) > sourceEnd) || JK_EXPECT_F(!isLegalUTF8(source, extraBytesToRead + 1))) {
-    source++;
-    while((source < sourceEnd) && (((*source) & 0xc0) == 0x80) && ((source - sourceStart) < (extraBytesToRead + 1))) { source++; } 
-    NSCParameterAssert(source <= sourceEnd);
-    result = ((source < sourceEnd) && (((*source) & 0xc0) != 0x80)) ? sourceIllegal : ((sourceStart + extraBytesToRead + 1) > sourceEnd) ? sourceExhausted : sourceIllegal;
-    ch = UNI_REPLACEMENT_CHAR;
-    goto finished;
-  }
-
-  switch(extraBytesToRead) { // The cases all fall through.
-    case 5: ch += *source++; ch <<= 6;
-    case 4: ch += *source++; ch <<= 6;
-    case 3: ch += *source++; ch <<= 6;
-    case 2: ch += *source++; ch <<= 6;
-    case 1: ch += *source++; ch <<= 6;
-    case 0: ch += *source++;
-  }
-  ch -= offsetsFromUTF8[extraBytesToRead];
-
-  result = isValidCodePoint(&ch);
-  
- finished:
-  *nextUTF8       = source;
-  *convertedUTF32 = ch;
-  
-  return(result);
+    
+    if(JK_EXPECT_F((source + extraBytesToRead + 1) > sourceEnd) || JK_EXPECT_F(!isLegalUTF8(source, extraBytesToRead + 1))) {
+        source++;
+        while((source < sourceEnd) && (((*source) & 0xc0) == 0x80) && ((source - sourceStart) < (extraBytesToRead + 1))) { source++; }
+        NSCParameterAssert(source <= sourceEnd);
+        result = ((source < sourceEnd) && (((*source) & 0xc0) != 0x80)) ? sourceIllegal : ((sourceStart + extraBytesToRead + 1) > sourceEnd) ? sourceExhausted : sourceIllegal;
+        ch = UNI_REPLACEMENT_CHAR;
+        goto finished;
+    }
+    
+    switch(extraBytesToRead) { // The cases all fall through.
+        case 5: ch += *source++; ch <<= 6;
+        case 4: ch += *source++; ch <<= 6;
+        case 3: ch += *source++; ch <<= 6;
+        case 2: ch += *source++; ch <<= 6;
+        case 1: ch += *source++; ch <<= 6;
+        case 0: ch += *source++;
+    }
+    ch -= offsetsFromUTF8[extraBytesToRead];
+    
+    result = isValidCodePoint(&ch);
+    
+finished:
+    *nextUTF8       = source;
+    *convertedUTF32 = ch;
+    
+    return(result);
 }
 
 
 static ConversionResult ConvertUTF32toUTF8 (UTF32 u32CodePoint, UTF8 **targetStart, UTF8 *targetEnd) {
-  const UTF32       byteMask     = 0xBF, byteMark = 0x80;
-  ConversionResult  result       = conversionOK;
-  UTF8             *target       = *targetStart;
-  UTF32             ch           = u32CodePoint;
-  unsigned short    bytesToWrite = 0;
-
-  result = isValidCodePoint(&ch);
-
-  // Figure out how many bytes the result will require. Turn any illegally large UTF32 things (> Plane 17) into replacement chars.
-       if(ch < (UTF32)0x80)          { bytesToWrite = 1; }
-  else if(ch < (UTF32)0x800)         { bytesToWrite = 2; }
-  else if(ch < (UTF32)0x10000)       { bytesToWrite = 3; }
-  else if(ch <= UNI_MAX_LEGAL_UTF32) { bytesToWrite = 4; }
-  else {                               bytesToWrite = 3; ch = UNI_REPLACEMENT_CHAR; result = sourceIllegal; }
-        
-  target += bytesToWrite;
-  if (target > targetEnd) { target -= bytesToWrite; result = targetExhausted; goto finished; }
-
-  switch (bytesToWrite) { // note: everything falls through.
-    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-    case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
-  }
-
-  target += bytesToWrite;
-
- finished:
-  *targetStart = target;
-  return(result);
+    const UTF32       byteMask     = 0xBF, byteMark = 0x80;
+    ConversionResult  result       = conversionOK;
+    UTF8             *target       = *targetStart;
+    UTF32             ch           = u32CodePoint;
+    unsigned short    bytesToWrite = 0;
+    
+    result = isValidCodePoint(&ch);
+    
+    // Figure out how many bytes the result will require. Turn any illegally large UTF32 things (> Plane 17) into replacement chars.
+    if(ch < (UTF32)0x80)          { bytesToWrite = 1; }
+    else if(ch < (UTF32)0x800)         { bytesToWrite = 2; }
+    else if(ch < (UTF32)0x10000)       { bytesToWrite = 3; }
+    else if(ch <= UNI_MAX_LEGAL_UTF32) { bytesToWrite = 4; }
+    else {                               bytesToWrite = 3; ch = UNI_REPLACEMENT_CHAR; result = sourceIllegal; }
+    
+    target += bytesToWrite;
+    if (target > targetEnd) { target -= bytesToWrite; result = targetExhausted; goto finished; }
+    
+    switch (bytesToWrite) { // note: everything falls through.
+        case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+        case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+        case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+        case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
+    }
+    
+    target += bytesToWrite;
+    
+finished:
+    *targetStart = target;
+    return(result);
 }
 
 JK_STATIC_INLINE int jk_string_add_unicodeCodePoint(JKParseState *parseState, uint32_t unicodeCodePoint, size_t *tokenBufferIdx, JKHash *stringHash) {
-  UTF8             *u8s = &parseState->token.tokenBuffer.bytes.ptr[*tokenBufferIdx];
-  ConversionResult  result;
-
-  if((result = ConvertUTF32toUTF8(unicodeCodePoint, &u8s, (parseState->token.tokenBuffer.bytes.ptr + parseState->token.tokenBuffer.bytes.length))) != conversionOK) { if(result == targetExhausted) { return(1); } }
-  size_t utf8len = u8s - &parseState->token.tokenBuffer.bytes.ptr[*tokenBufferIdx], nextIdx = (*tokenBufferIdx) + utf8len;
-  
-  while(*tokenBufferIdx < nextIdx) { *stringHash = jk_calculateHash(*stringHash, parseState->token.tokenBuffer.bytes.ptr[(*tokenBufferIdx)++]); }
-
-  return(0);
+    UTF8             *u8s = &parseState->token.tokenBuffer.bytes.ptr[*tokenBufferIdx];
+    ConversionResult  result;
+    
+    if((result = ConvertUTF32toUTF8(unicodeCodePoint, &u8s, (parseState->token.tokenBuffer.bytes.ptr + parseState->token.tokenBuffer.bytes.length))) != conversionOK) { if(result == targetExhausted) { return(1); } }
+    size_t utf8len = u8s - &parseState->token.tokenBuffer.bytes.ptr[*tokenBufferIdx], nextIdx = (*tokenBufferIdx) + utf8len;
+    
+    while(*tokenBufferIdx < nextIdx) { *stringHash = jk_calculateHash(*stringHash, parseState->token.tokenBuffer.bytes.ptr[(*tokenBufferIdx)++]); }
+    
+    return(0);
 }
 
 ////////////
@@ -1421,553 +1421,553 @@ JK_STATIC_INLINE int jk_string_add_unicodeCodePoint(JKParseState *parseState, ui
 #pragma mark Decoding / parsing / deserializing functions
 
 static int jk_parse_string(JKParseState *parseState) {
-  NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
-  const unsigned char *stringStart       = JK_AT_STRING_PTR(parseState) + 1;
-  const unsigned char *endOfBuffer       = JK_END_STRING_PTR(parseState);
-  const unsigned char *atStringCharacter = stringStart;
-  unsigned char       *tokenBuffer       = parseState->token.tokenBuffer.bytes.ptr;
-  size_t               tokenStartIndex   = parseState->atIndex;
-  size_t               tokenBufferIdx    = 0UL;
-
-  int      onlySimpleString        = 1,  stringState     = JSONStringStateStart;
-  uint16_t escapedUnicode1         = 0U, escapedUnicode2 = 0U;
-  uint32_t escapedUnicodeCodePoint = 0U;
-  JKHash   stringHash              = JK_HASH_INIT;
-    
-  while(1) {
-    unsigned long currentChar;
-
-    if(JK_EXPECT_F(atStringCharacter == endOfBuffer)) { /* XXX Add error message */ stringState = JSONStringStateError; goto finishedParsing; }
-    
-    if(JK_EXPECT_F((currentChar = *atStringCharacter++) >= 0x80UL)) {
-      const unsigned char *nextValidCharacter = NULL;
-      UTF32                u32ch              = 0U;
-      ConversionResult     result;
-
-      if(JK_EXPECT_F((result = ConvertSingleCodePointInUTF8(atStringCharacter - 1, endOfBuffer, (UTF8 const **)&nextValidCharacter, &u32ch)) != conversionOK)) { goto switchToSlowPath; }
-      stringHash = jk_calculateHash(stringHash, currentChar);
-      while(atStringCharacter < nextValidCharacter) { NSCParameterAssert(JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)); stringHash = jk_calculateHash(stringHash, *atStringCharacter++); }
-      continue;
-    } else {
-      if(JK_EXPECT_F(currentChar == (unsigned long)'"')) { stringState = JSONStringStateFinished; goto finishedParsing; }
-
-      if(JK_EXPECT_F(currentChar == (unsigned long)'\\')) {
-      switchToSlowPath:
-        onlySimpleString = 0;
-        stringState      = JSONStringStateParsing;
-        tokenBufferIdx   = (atStringCharacter - stringStart) - 1L;
-        if(JK_EXPECT_F((tokenBufferIdx + 16UL) > parseState->token.tokenBuffer.bytes.length)) { if((tokenBuffer = jk_managedBuffer_resize(&parseState->token.tokenBuffer, tokenBufferIdx + 1024UL)) == NULL) { jk_error(parseState, @"Internal error: Unable to resize temporary buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
-        memcpy(tokenBuffer, stringStart, tokenBufferIdx);
-        goto slowMatch;
-      }
-
-      if(JK_EXPECT_F(currentChar < 0x20UL)) { jk_error(parseState, @"Invalid character < 0x20 found in string: 0x%2.2x.", currentChar); stringState = JSONStringStateError; goto finishedParsing; }
-
-      stringHash = jk_calculateHash(stringHash, currentChar);
-    }
-  }
-
- slowMatch:
-
-  for(atStringCharacter = (stringStart + ((atStringCharacter - stringStart) - 1L)); (atStringCharacter < endOfBuffer) && (tokenBufferIdx < parseState->token.tokenBuffer.bytes.length); atStringCharacter++) {
-    if((tokenBufferIdx + 16UL) > parseState->token.tokenBuffer.bytes.length) { if((tokenBuffer = jk_managedBuffer_resize(&parseState->token.tokenBuffer, tokenBufferIdx + 1024UL)) == NULL) { jk_error(parseState, @"Internal error: Unable to resize temporary buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
-
-    NSCParameterAssert(tokenBufferIdx < parseState->token.tokenBuffer.bytes.length);
-
-    unsigned long currentChar = (*atStringCharacter), escapedChar;
-
-    if(JK_EXPECT_T(stringState == JSONStringStateParsing)) {
-      if(JK_EXPECT_T(currentChar >= 0x20UL)) {
-        if(JK_EXPECT_T(currentChar < (unsigned long)0x80)) { // Not a UTF8 sequence
-          if(JK_EXPECT_F(currentChar == (unsigned long)'"'))  { stringState = JSONStringStateFinished; atStringCharacter++; goto finishedParsing; }
-          if(JK_EXPECT_F(currentChar == (unsigned long)'\\')) { stringState = JSONStringStateEscape; continue; }
-          stringHash = jk_calculateHash(stringHash, currentChar);
-          tokenBuffer[tokenBufferIdx++] = currentChar;
-          continue;
-        } else { // UTF8 sequence
-          const unsigned char *nextValidCharacter = NULL;
-          UTF32                u32ch              = 0U;
-          ConversionResult     result;
-          
-          if(JK_EXPECT_F((result = ConvertSingleCodePointInUTF8(atStringCharacter, endOfBuffer, (UTF8 const **)&nextValidCharacter, &u32ch)) != conversionOK)) {
-            if((result == sourceIllegal) && ((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0)) { jk_error(parseState, @"Illegal UTF8 sequence found in \"\" string.");              stringState = JSONStringStateError; goto finishedParsing; }
-            if(result == sourceExhausted)                                                                      { jk_error(parseState, @"End of buffer reached while parsing UTF8 in \"\" string."); stringState = JSONStringStateError; goto finishedParsing; }
-            if(jk_string_add_unicodeCodePoint(parseState, u32ch, &tokenBufferIdx, &stringHash))                { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; }
-            atStringCharacter = nextValidCharacter - 1;
-            continue;
-          } else {
-            while(atStringCharacter < nextValidCharacter) { tokenBuffer[tokenBufferIdx++] = *atStringCharacter; stringHash = jk_calculateHash(stringHash, *atStringCharacter++); }
-            atStringCharacter--;
+    NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
+    const unsigned char *stringStart       = JK_AT_STRING_PTR(parseState) + 1;
+    const unsigned char *endOfBuffer       = JK_END_STRING_PTR(parseState);
+    const unsigned char *atStringCharacter = stringStart;
+    unsigned char       *tokenBuffer       = parseState->token.tokenBuffer.bytes.ptr;
+    size_t               tokenStartIndex   = parseState->atIndex;
+    size_t               tokenBufferIdx    = 0UL;
+    
+    int      onlySimpleString        = 1,  stringState     = JSONStringStateStart;
+    uint16_t escapedUnicode1         = 0U, escapedUnicode2 = 0U;
+    uint32_t escapedUnicodeCodePoint = 0U;
+    JKHash   stringHash              = JK_HASH_INIT;
+    
+    while(1) {
+        unsigned long currentChar;
+        
+        if(JK_EXPECT_F(atStringCharacter == endOfBuffer)) { /* XXX Add error message */ stringState = JSONStringStateError; goto finishedParsing; }
+        
+        if(JK_EXPECT_F((currentChar = *atStringCharacter++) >= 0x80UL)) {
+            const unsigned char *nextValidCharacter = NULL;
+            UTF32                u32ch              = 0U;
+            ConversionResult     result;
+            
+            if(JK_EXPECT_F((result = ConvertSingleCodePointInUTF8(atStringCharacter - 1, endOfBuffer, (UTF8 const **)&nextValidCharacter, &u32ch)) != conversionOK)) { goto switchToSlowPath; }
+            stringHash = jk_calculateHash(stringHash, currentChar);
+            while(atStringCharacter < nextValidCharacter) { NSCParameterAssert(JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)); stringHash = jk_calculateHash(stringHash, *atStringCharacter++); }
             continue;
-          }
+        } else {
+            if(JK_EXPECT_F(currentChar == (unsigned long)'"')) { stringState = JSONStringStateFinished; goto finishedParsing; }
+            
+            if(JK_EXPECT_F(currentChar == (unsigned long)'\\')) {
+            switchToSlowPath:
+                onlySimpleString = 0;
+                stringState      = JSONStringStateParsing;
+                tokenBufferIdx   = (atStringCharacter - stringStart) - 1L;
+                if(JK_EXPECT_F((tokenBufferIdx + 16UL) > parseState->token.tokenBuffer.bytes.length)) { if((tokenBuffer = jk_managedBuffer_resize(&parseState->token.tokenBuffer, tokenBufferIdx + 1024UL)) == NULL) { jk_error(parseState, @"Internal error: Unable to resize temporary buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
+                memcpy(tokenBuffer, stringStart, tokenBufferIdx);
+                goto slowMatch;
+            }
+            
+            if(JK_EXPECT_F(currentChar < 0x20UL)) { jk_error(parseState, @"Invalid character < 0x20 found in string: 0x%2.2x.", currentChar); stringState = JSONStringStateError; goto finishedParsing; }
+            
+            stringHash = jk_calculateHash(stringHash, currentChar);
         }
-      } else { // currentChar < 0x20
-        jk_error(parseState, @"Invalid character < 0x20 found in string: 0x%2.2x.", currentChar); stringState = JSONStringStateError; goto finishedParsing;
-      }
-
-    } else { // stringState != JSONStringStateParsing
-      int isSurrogate = 1;
-
-      switch(stringState) {
-        case JSONStringStateEscape:
-          switch(currentChar) {
-            case 'u': escapedUnicode1 = 0U; escapedUnicode2 = 0U; escapedUnicodeCodePoint = 0U; stringState = JSONStringStateEscapedUnicode1; break;
-
-            case 'b':  escapedChar = '\b'; goto parsedEscapedChar;
-            case 'f':  escapedChar = '\f'; goto parsedEscapedChar;
-            case 'n':  escapedChar = '\n'; goto parsedEscapedChar;
-            case 'r':  escapedChar = '\r'; goto parsedEscapedChar;
-            case 't':  escapedChar = '\t'; goto parsedEscapedChar;
-            case '\\': escapedChar = '\\'; goto parsedEscapedChar;
-            case '/':  escapedChar = '/';  goto parsedEscapedChar;
-            case '"':  escapedChar = '"';  goto parsedEscapedChar;
-              
-            parsedEscapedChar:
-              stringState = JSONStringStateParsing;
-              stringHash  = jk_calculateHash(stringHash, escapedChar);
-              tokenBuffer[tokenBufferIdx++] = escapedChar;
-              break;
-              
-            default: jk_error(parseState, @"Invalid escape sequence found in \"\" string."); stringState = JSONStringStateError; goto finishedParsing; break;
-          }
-          break;
-
-        case JSONStringStateEscapedUnicode1:
-        case JSONStringStateEscapedUnicode2:
-        case JSONStringStateEscapedUnicode3:
-        case JSONStringStateEscapedUnicode4:           isSurrogate = 0;
-        case JSONStringStateEscapedUnicodeSurrogate1:
-        case JSONStringStateEscapedUnicodeSurrogate2:
-        case JSONStringStateEscapedUnicodeSurrogate3:
-        case JSONStringStateEscapedUnicodeSurrogate4:
-          {
-            uint16_t hexValue = 0U;
-
-            switch(currentChar) {
-              case '0' ... '9': hexValue =  currentChar - '0';        goto parsedHex;
-              case 'a' ... 'f': hexValue = (currentChar - 'a') + 10U; goto parsedHex;
-              case 'A' ... 'F': hexValue = (currentChar - 'A') + 10U; goto parsedHex;
-                
-              parsedHex:
-              if(!isSurrogate) { escapedUnicode1 = (escapedUnicode1 << 4) | hexValue; } else { escapedUnicode2 = (escapedUnicode2 << 4) | hexValue; }
-                
-              if(stringState == JSONStringStateEscapedUnicode4) {
-                if(((escapedUnicode1 >= 0xD800U) && (escapedUnicode1 < 0xE000U))) {
-                  if((escapedUnicode1 >= 0xD800U) && (escapedUnicode1 < 0xDC00U)) { stringState = JSONStringStateEscapedNeedEscapeForSurrogate; }
-                  else if((escapedUnicode1 >= 0xDC00U) && (escapedUnicode1 < 0xE000U)) { 
-                    if((parseState->parseOptionFlags & JKParseOptionLooseUnicode)) { escapedUnicodeCodePoint = UNI_REPLACEMENT_CHAR; }
-                    else { jk_error(parseState, @"Illegal \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
-                  }
+    }
+    
+slowMatch:
+    
+    for(atStringCharacter = (stringStart + ((atStringCharacter - stringStart) - 1L)); (atStringCharacter < endOfBuffer) && (tokenBufferIdx < parseState->token.tokenBuffer.bytes.length); atStringCharacter++) {
+        if((tokenBufferIdx + 16UL) > parseState->token.tokenBuffer.bytes.length) { if((tokenBuffer = jk_managedBuffer_resize(&parseState->token.tokenBuffer, tokenBufferIdx + 1024UL)) == NULL) { jk_error(parseState, @"Internal error: Unable to resize temporary buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
+        
+        NSCParameterAssert(tokenBufferIdx < parseState->token.tokenBuffer.bytes.length);
+        
+        unsigned long currentChar = (*atStringCharacter), escapedChar;
+        
+        if(JK_EXPECT_T(stringState == JSONStringStateParsing)) {
+            if(JK_EXPECT_T(currentChar >= 0x20UL)) {
+                if(JK_EXPECT_T(currentChar < (unsigned long)0x80)) { // Not a UTF8 sequence
+                    if(JK_EXPECT_F(currentChar == (unsigned long)'"'))  { stringState = JSONStringStateFinished; atStringCharacter++; goto finishedParsing; }
+                    if(JK_EXPECT_F(currentChar == (unsigned long)'\\')) { stringState = JSONStringStateEscape; continue; }
+                    stringHash = jk_calculateHash(stringHash, currentChar);
+                    tokenBuffer[tokenBufferIdx++] = currentChar;
+                    continue;
+                } else { // UTF8 sequence
+                    const unsigned char *nextValidCharacter = NULL;
+                    UTF32                u32ch              = 0U;
+                    ConversionResult     result;
+                    
+                    if(JK_EXPECT_F((result = ConvertSingleCodePointInUTF8(atStringCharacter, endOfBuffer, (UTF8 const **)&nextValidCharacter, &u32ch)) != conversionOK)) {
+                        if((result == sourceIllegal) && ((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0)) { jk_error(parseState, @"Illegal UTF8 sequence found in \"\" string.");              stringState = JSONStringStateError; goto finishedParsing; }
+                        if(result == sourceExhausted)                                                                      { jk_error(parseState, @"End of buffer reached while parsing UTF8 in \"\" string."); stringState = JSONStringStateError; goto finishedParsing; }
+                        if(jk_string_add_unicodeCodePoint(parseState, u32ch, &tokenBufferIdx, &stringHash))                { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; }
+                        atStringCharacter = nextValidCharacter - 1;
+                        continue;
+                    } else {
+                        while(atStringCharacter < nextValidCharacter) { tokenBuffer[tokenBufferIdx++] = *atStringCharacter; stringHash = jk_calculateHash(stringHash, *atStringCharacter++); }
+                        atStringCharacter--;
+                        continue;
+                    }
                 }
-                else { escapedUnicodeCodePoint = escapedUnicode1; }
-              }
-
-              if(stringState == JSONStringStateEscapedUnicodeSurrogate4) {
-                if((escapedUnicode2 < 0xdc00) || (escapedUnicode2 > 0xdfff)) {
-                  if((parseState->parseOptionFlags & JKParseOptionLooseUnicode)) { escapedUnicodeCodePoint = UNI_REPLACEMENT_CHAR; }
-                  else { jk_error(parseState, @"Illegal \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
+            } else { // currentChar < 0x20
+                jk_error(parseState, @"Invalid character < 0x20 found in string: 0x%2.2x.", currentChar); stringState = JSONStringStateError; goto finishedParsing;
+            }
+            
+        } else { // stringState != JSONStringStateParsing
+            int isSurrogate = 1;
+            
+            switch(stringState) {
+                case JSONStringStateEscape:
+                    switch(currentChar) {
+                        case 'u': escapedUnicode1 = 0U; escapedUnicode2 = 0U; escapedUnicodeCodePoint = 0U; stringState = JSONStringStateEscapedUnicode1; break;
+                            
+                        case 'b':  escapedChar = '\b'; goto parsedEscapedChar;
+                        case 'f':  escapedChar = '\f'; goto parsedEscapedChar;
+                        case 'n':  escapedChar = '\n'; goto parsedEscapedChar;
+                        case 'r':  escapedChar = '\r'; goto parsedEscapedChar;
+                        case 't':  escapedChar = '\t'; goto parsedEscapedChar;
+                        case '\\': escapedChar = '\\'; goto parsedEscapedChar;
+                        case '/':  escapedChar = '/';  goto parsedEscapedChar;
+                        case '"':  escapedChar = '"';  goto parsedEscapedChar;
+                            
+                        parsedEscapedChar:
+                            stringState = JSONStringStateParsing;
+                            stringHash  = jk_calculateHash(stringHash, escapedChar);
+                            tokenBuffer[tokenBufferIdx++] = escapedChar;
+                            break;
+                            
+                        default: jk_error(parseState, @"Invalid escape sequence found in \"\" string."); stringState = JSONStringStateError; goto finishedParsing; break;
+                    }
+                    break;
+                    
+                case JSONStringStateEscapedUnicode1:
+                case JSONStringStateEscapedUnicode2:
+                case JSONStringStateEscapedUnicode3:
+                case JSONStringStateEscapedUnicode4:           isSurrogate = 0;
+                case JSONStringStateEscapedUnicodeSurrogate1:
+                case JSONStringStateEscapedUnicodeSurrogate2:
+                case JSONStringStateEscapedUnicodeSurrogate3:
+                case JSONStringStateEscapedUnicodeSurrogate4:
+                {
+                    uint16_t hexValue = 0U;
+                    
+                    switch(currentChar) {
+                        case '0' ... '9': hexValue =  currentChar - '0';        goto parsedHex;
+                        case 'a' ... 'f': hexValue = (currentChar - 'a') + 10U; goto parsedHex;
+                        case 'A' ... 'F': hexValue = (currentChar - 'A') + 10U; goto parsedHex;
+                            
+                        parsedHex:
+                            if(!isSurrogate) { escapedUnicode1 = (escapedUnicode1 << 4) | hexValue; } else { escapedUnicode2 = (escapedUnicode2 << 4) | hexValue; }
+                            
+                            if(stringState == JSONStringStateEscapedUnicode4) {
+                                if(((escapedUnicode1 >= 0xD800U) && (escapedUnicode1 < 0xE000U))) {
+                                    if((escapedUnicode1 >= 0xD800U) && (escapedUnicode1 < 0xDC00U)) { stringState = JSONStringStateEscapedNeedEscapeForSurrogate; }
+                                    else if((escapedUnicode1 >= 0xDC00U) && (escapedUnicode1 < 0xE000U)) {
+                                        if((parseState->parseOptionFlags & JKParseOptionLooseUnicode)) { escapedUnicodeCodePoint = UNI_REPLACEMENT_CHAR; }
+                                        else { jk_error(parseState, @"Illegal \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
+                                    }
+                                }
+                                else { escapedUnicodeCodePoint = escapedUnicode1; }
+                            }
+                            
+                            if(stringState == JSONStringStateEscapedUnicodeSurrogate4) {
+                                if((escapedUnicode2 < 0xdc00) || (escapedUnicode2 > 0xdfff)) {
+                                    if((parseState->parseOptionFlags & JKParseOptionLooseUnicode)) { escapedUnicodeCodePoint = UNI_REPLACEMENT_CHAR; }
+                                    else { jk_error(parseState, @"Illegal \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
+                                }
+                                else { escapedUnicodeCodePoint = ((escapedUnicode1 - 0xd800) * 0x400) + (escapedUnicode2 - 0xdc00) + 0x10000; }
+                            }
+                            
+                            if((stringState == JSONStringStateEscapedUnicode4) || (stringState == JSONStringStateEscapedUnicodeSurrogate4)) {
+                                if((isValidCodePoint(&escapedUnicodeCodePoint) == sourceIllegal) && ((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0)) { jk_error(parseState, @"Illegal \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
+                                stringState = JSONStringStateParsing;
+                                if(jk_string_add_unicodeCodePoint(parseState, escapedUnicodeCodePoint, &tokenBufferIdx, &stringHash)) { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; }
+                            }
+                            else if((stringState >= JSONStringStateEscapedUnicode1) && (stringState <= JSONStringStateEscapedUnicodeSurrogate4)) { stringState++; }
+                            break;
+                            
+                        default: jk_error(parseState, @"Unexpected character found in \\u Unicode escape sequence.  Found '%c', expected [0-9a-fA-F].", currentChar); stringState = JSONStringStateError; goto finishedParsing; break;
+                    }
                 }
-                else { escapedUnicodeCodePoint = ((escapedUnicode1 - 0xd800) * 0x400) + (escapedUnicode2 - 0xdc00) + 0x10000; }
-              }
-                
-              if((stringState == JSONStringStateEscapedUnicode4) || (stringState == JSONStringStateEscapedUnicodeSurrogate4)) { 
-                if((isValidCodePoint(&escapedUnicodeCodePoint) == sourceIllegal) && ((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0)) { jk_error(parseState, @"Illegal \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
-                stringState = JSONStringStateParsing;
-                if(jk_string_add_unicodeCodePoint(parseState, escapedUnicodeCodePoint, &tokenBufferIdx, &stringHash)) { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; }
-              }
-              else if((stringState >= JSONStringStateEscapedUnicode1) && (stringState <= JSONStringStateEscapedUnicodeSurrogate4)) { stringState++; }
-              break;
-
-              default: jk_error(parseState, @"Unexpected character found in \\u Unicode escape sequence.  Found '%c', expected [0-9a-fA-F].", currentChar); stringState = JSONStringStateError; goto finishedParsing; break;
+                    break;
+                    
+                case JSONStringStateEscapedNeedEscapeForSurrogate:
+                    if(currentChar == '\\') { stringState = JSONStringStateEscapedNeedEscapedUForSurrogate; }
+                    else {
+                        if((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0) { jk_error(parseState, @"Required a second \\u Unicode escape sequence following a surrogate \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
+                        else { stringState = JSONStringStateParsing; atStringCharacter--;    if(jk_string_add_unicodeCodePoint(parseState, UNI_REPLACEMENT_CHAR, &tokenBufferIdx, &stringHash)) { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
+                    }
+                    break;
+                    
+                case JSONStringStateEscapedNeedEscapedUForSurrogate:
+                    if(currentChar == 'u') { stringState = JSONStringStateEscapedUnicodeSurrogate1; }
+                    else {
+                        if((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0) { jk_error(parseState, @"Required a second \\u Unicode escape sequence following a surrogate \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
+                        else { stringState = JSONStringStateParsing; atStringCharacter -= 2; if(jk_string_add_unicodeCodePoint(parseState, UNI_REPLACEMENT_CHAR, &tokenBufferIdx, &stringHash)) { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
+                    }
+                    break;
+                    
+                default: jk_error(parseState, @"Internal error: Unknown stringState. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; break;
             }
-          }
-          break;
-
-        case JSONStringStateEscapedNeedEscapeForSurrogate:
-          if(currentChar == '\\') { stringState = JSONStringStateEscapedNeedEscapedUForSurrogate; }
-          else { 
-            if((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0) { jk_error(parseState, @"Required a second \\u Unicode escape sequence following a surrogate \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
-            else { stringState = JSONStringStateParsing; atStringCharacter--;    if(jk_string_add_unicodeCodePoint(parseState, UNI_REPLACEMENT_CHAR, &tokenBufferIdx, &stringHash)) { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
-          }
-          break;
-
-        case JSONStringStateEscapedNeedEscapedUForSurrogate:
-          if(currentChar == 'u') { stringState = JSONStringStateEscapedUnicodeSurrogate1; }
-          else { 
-            if((parseState->parseOptionFlags & JKParseOptionLooseUnicode) == 0) { jk_error(parseState, @"Required a second \\u Unicode escape sequence following a surrogate \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
-            else { stringState = JSONStringStateParsing; atStringCharacter -= 2; if(jk_string_add_unicodeCodePoint(parseState, UNI_REPLACEMENT_CHAR, &tokenBufferIdx, &stringHash)) { jk_error(parseState, @"Internal error: Unable to add UTF8 sequence to internal string buffer. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; } }
-          }
-          break;
-
-        default: jk_error(parseState, @"Internal error: Unknown stringState. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); stringState = JSONStringStateError; goto finishedParsing; break;
-      }
+        }
     }
-  }
-
+    
 finishedParsing:
-
-  if(JK_EXPECT_T(stringState == JSONStringStateFinished)) {
-    NSCParameterAssert((parseState->stringBuffer.bytes.ptr + tokenStartIndex) < atStringCharacter);
-
-    parseState->token.tokenPtrRange.ptr    = parseState->stringBuffer.bytes.ptr + tokenStartIndex;
-    parseState->token.tokenPtrRange.length = (atStringCharacter - parseState->token.tokenPtrRange.ptr);
-
-    if(JK_EXPECT_T(onlySimpleString)) {
-      NSCParameterAssert(((parseState->token.tokenPtrRange.ptr + 1) < endOfBuffer) && (parseState->token.tokenPtrRange.length >= 2UL) && (((parseState->token.tokenPtrRange.ptr + 1) + (parseState->token.tokenPtrRange.length - 2)) < endOfBuffer));
-      parseState->token.value.ptrRange.ptr    = parseState->token.tokenPtrRange.ptr    + 1;
-      parseState->token.value.ptrRange.length = parseState->token.tokenPtrRange.length - 2UL;
-    } else {
-      parseState->token.value.ptrRange.ptr    = parseState->token.tokenBuffer.bytes.ptr;
-      parseState->token.value.ptrRange.length = tokenBufferIdx;
+    
+    if(JK_EXPECT_T(stringState == JSONStringStateFinished)) {
+        NSCParameterAssert((parseState->stringBuffer.bytes.ptr + tokenStartIndex) < atStringCharacter);
+        
+        parseState->token.tokenPtrRange.ptr    = parseState->stringBuffer.bytes.ptr + tokenStartIndex;
+        parseState->token.tokenPtrRange.length = (atStringCharacter - parseState->token.tokenPtrRange.ptr);
+        
+        if(JK_EXPECT_T(onlySimpleString)) {
+            NSCParameterAssert(((parseState->token.tokenPtrRange.ptr + 1) < endOfBuffer) && (parseState->token.tokenPtrRange.length >= 2UL) && (((parseState->token.tokenPtrRange.ptr + 1) + (parseState->token.tokenPtrRange.length - 2)) < endOfBuffer));
+            parseState->token.value.ptrRange.ptr    = parseState->token.tokenPtrRange.ptr    + 1;
+            parseState->token.value.ptrRange.length = parseState->token.tokenPtrRange.length - 2UL;
+        } else {
+            parseState->token.value.ptrRange.ptr    = parseState->token.tokenBuffer.bytes.ptr;
+            parseState->token.value.ptrRange.length = tokenBufferIdx;
+        }
+        
+        parseState->token.value.hash = stringHash;
+        parseState->token.value.type = JKValueTypeString;
+        parseState->atIndex          = (atStringCharacter - parseState->stringBuffer.bytes.ptr);
     }
     
-    parseState->token.value.hash = stringHash;
-    parseState->token.value.type = JKValueTypeString;
-    parseState->atIndex          = (atStringCharacter - parseState->stringBuffer.bytes.ptr);
-  }
-
-  if(JK_EXPECT_F(stringState != JSONStringStateFinished)) { jk_error(parseState, @"Invalid string."); }
-  return(JK_EXPECT_T(stringState == JSONStringStateFinished) ? 0 : 1);
+    if(JK_EXPECT_F(stringState != JSONStringStateFinished)) { jk_error(parseState, @"Invalid string."); }
+    return(JK_EXPECT_T(stringState == JSONStringStateFinished) ? 0 : 1);
 }
 
 static int jk_parse_number(JKParseState *parseState) {
-  NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
-  const unsigned char *numberStart       = JK_AT_STRING_PTR(parseState);
-  const unsigned char *endOfBuffer       = JK_END_STRING_PTR(parseState);
-  const unsigned char *atNumberCharacter = NULL;
-  int                  numberState       = JSONNumberStateWholeNumberStart, isFloatingPoint = 0, isNegative = 0, backup = 0;
-  size_t               startingIndex     = parseState->atIndex;
-  
-  for(atNumberCharacter = numberStart; (JK_EXPECT_T(atNumberCharacter < endOfBuffer)) && (JK_EXPECT_T(!(JK_EXPECT_F(numberState == JSONNumberStateFinished) || JK_EXPECT_F(numberState == JSONNumberStateError)))); atNumberCharacter++) {
-    unsigned long currentChar = (unsigned long)(*atNumberCharacter), lowerCaseCC = currentChar | 0x20UL;
-    
-    switch(numberState) {
-      case JSONNumberStateWholeNumberStart: if   (currentChar == '-')                                                                              { numberState = JSONNumberStateWholeNumberMinus;      isNegative      = 1; break; }
-      case JSONNumberStateWholeNumberMinus: if   (currentChar == '0')                                                                              { numberState = JSONNumberStateWholeNumberZero;                            break; }
-                                       else if(  (currentChar >= '1') && (currentChar <= '9'))                                                     { numberState = JSONNumberStateWholeNumber;                                break; }
-                                       else                                                     { /* XXX Add error message */                        numberState = JSONNumberStateError;                                      break; }
-      case JSONNumberStateExponentStart:    if(  (currentChar == '+') || (currentChar == '-'))                                                     { numberState = JSONNumberStateExponentPlusMinus;                          break; }
-      case JSONNumberStateFractionalNumberStart:
-      case JSONNumberStateExponentPlusMinus:if(!((currentChar >= '0') && (currentChar <= '9'))) { /* XXX Add error message */                        numberState = JSONNumberStateError;                                      break; }
-                                       else {                                              if(numberState == JSONNumberStateFractionalNumberStart) { numberState = JSONNumberStateFractionalNumber; }
-                                                                                           else                                                    { numberState = JSONNumberStateExponent;         }                         break; }
-      case JSONNumberStateWholeNumberZero:
-      case JSONNumberStateWholeNumber:      if   (currentChar == '.')                                                                              { numberState = JSONNumberStateFractionalNumberStart; isFloatingPoint = 1; break; }
-      case JSONNumberStateFractionalNumber: if   (lowerCaseCC == 'e')                                                                              { numberState = JSONNumberStateExponentStart;         isFloatingPoint = 1; break; }
-      case JSONNumberStateExponent:         if(!((currentChar >= '0') && (currentChar <= '9')) || (numberState == JSONNumberStateWholeNumberZero)) { numberState = JSONNumberStateFinished;              backup          = 1; break; }
-        break;
-      default:                                                                                    /* XXX Add error message */                        numberState = JSONNumberStateError;                                      break;
-    }
-  }
-  
-  parseState->token.tokenPtrRange.ptr    = parseState->stringBuffer.bytes.ptr + startingIndex;
-  parseState->token.tokenPtrRange.length = (atNumberCharacter - parseState->token.tokenPtrRange.ptr) - backup;
-  parseState->atIndex                    = (parseState->token.tokenPtrRange.ptr + parseState->token.tokenPtrRange.length) - parseState->stringBuffer.bytes.ptr;
-
-  if(JK_EXPECT_T(numberState == JSONNumberStateFinished)) {
-    unsigned char  numberTempBuf[parseState->token.tokenPtrRange.length + 4UL];
-    unsigned char *endOfNumber = NULL;
-
-    memcpy(numberTempBuf, parseState->token.tokenPtrRange.ptr, parseState->token.tokenPtrRange.length);
-    numberTempBuf[parseState->token.tokenPtrRange.length] = 0;
-
-    errno = 0;
-    
-    // Treat "-0" as a floating point number, which is capable of representing negative zeros.
-    if(JK_EXPECT_F(parseState->token.tokenPtrRange.length == 2UL) && JK_EXPECT_F(numberTempBuf[1] == '0') && JK_EXPECT_F(isNegative)) { isFloatingPoint = 1; }
-
-    if(isFloatingPoint) {
-      parseState->token.value.number.doubleValue = strtod((const char *)numberTempBuf, (char **)&endOfNumber); // strtod is documented to return U+2261 (identical to) 0.0 on an underflow error (along with setting errno to ERANGE).
-      parseState->token.value.type               = JKValueTypeDouble;
-      parseState->token.value.ptrRange.ptr       = (const unsigned char *)&parseState->token.value.number.doubleValue;
-      parseState->token.value.ptrRange.length    = sizeof(double);
-      parseState->token.value.hash               = (JK_HASH_INIT + parseState->token.value.type);
-    } else {
-      if(isNegative) {
-        parseState->token.value.number.longLongValue = strtoll((const char *)numberTempBuf, (char **)&endOfNumber, 10);
-        parseState->token.value.type                 = JKValueTypeLongLong;
-        parseState->token.value.ptrRange.ptr         = (const unsigned char *)&parseState->token.value.number.longLongValue;
-        parseState->token.value.ptrRange.length      = sizeof(long long);
-        parseState->token.value.hash                 = (JK_HASH_INIT + parseState->token.value.type) + (JKHash)parseState->token.value.number.longLongValue;
-      } else {
-        parseState->token.value.number.unsignedLongLongValue = strtoull((const char *)numberTempBuf, (char **)&endOfNumber, 10);
-        parseState->token.value.type                         = JKValueTypeUnsignedLongLong;
-        parseState->token.value.ptrRange.ptr                 = (const unsigned char *)&parseState->token.value.number.unsignedLongLongValue;
-        parseState->token.value.ptrRange.length              = sizeof(unsigned long long);
-        parseState->token.value.hash                         = (JK_HASH_INIT + parseState->token.value.type) + (JKHash)parseState->token.value.number.unsignedLongLongValue;
-      }
+    NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
+    const unsigned char *numberStart       = JK_AT_STRING_PTR(parseState);
+    const unsigned char *endOfBuffer       = JK_END_STRING_PTR(parseState);
+    const unsigned char *atNumberCharacter = NULL;
+    int                  numberState       = JSONNumberStateWholeNumberStart, isFloatingPoint = 0, isNegative = 0, backup = 0;
+    size_t               startingIndex     = parseState->atIndex;
+    
+    for(atNumberCharacter = numberStart; (JK_EXPECT_T(atNumberCharacter < endOfBuffer)) && (JK_EXPECT_T(!(JK_EXPECT_F(numberState == JSONNumberStateFinished) || JK_EXPECT_F(numberState == JSONNumberStateError)))); atNumberCharacter++) {
+        unsigned long currentChar = (unsigned long)(*atNumberCharacter), lowerCaseCC = currentChar | 0x20UL;
+        
+        switch(numberState) {
+            case JSONNumberStateWholeNumberStart: if   (currentChar == '-')                                                                              { numberState = JSONNumberStateWholeNumberMinus;      isNegative      = 1; break; }
+            case JSONNumberStateWholeNumberMinus: if   (currentChar == '0')                                                                              { numberState = JSONNumberStateWholeNumberZero;                            break; }
+            else if(  (currentChar >= '1') && (currentChar <= '9'))                                                     { numberState = JSONNumberStateWholeNumber;                                break; }
+            else                                                     { /* XXX Add error message */                        numberState = JSONNumberStateError;                                      break; }
+            case JSONNumberStateExponentStart:    if(  (currentChar == '+') || (currentChar == '-'))                                                     { numberState = JSONNumberStateExponentPlusMinus;                          break; }
+            case JSONNumberStateFractionalNumberStart:
+            case JSONNumberStateExponentPlusMinus:if(!((currentChar >= '0') && (currentChar <= '9'))) { /* XXX Add error message */                        numberState = JSONNumberStateError;                                      break; }
+            else {                                              if(numberState == JSONNumberStateFractionalNumberStart) { numberState = JSONNumberStateFractionalNumber; }
+                else                                                    { numberState = JSONNumberStateExponent;         }                         break; }
+            case JSONNumberStateWholeNumberZero:
+            case JSONNumberStateWholeNumber:      if   (currentChar == '.')                                                                              { numberState = JSONNumberStateFractionalNumberStart; isFloatingPoint = 1; break; }
+            case JSONNumberStateFractionalNumber: if   (lowerCaseCC == 'e')                                                                              { numberState = JSONNumberStateExponentStart;         isFloatingPoint = 1; break; }
+            case JSONNumberStateExponent:         if(!((currentChar >= '0') && (currentChar <= '9')) || (numberState == JSONNumberStateWholeNumberZero)) { numberState = JSONNumberStateFinished;              backup          = 1; break; }
+                break;
+            default:                                                                                    /* XXX Add error message */                        numberState = JSONNumberStateError;                                      break;
+        }
     }
-
-    if(JK_EXPECT_F(errno != 0)) {
-      numberState = JSONNumberStateError;
-      if(errno == ERANGE) {
-        switch(parseState->token.value.type) {
-          case JKValueTypeDouble:           jk_error(parseState, @"The value '%s' could not be represented as a 'double' due to %s.",           numberTempBuf, (parseState->token.value.number.doubleValue == 0.0) ? "underflow" : "overflow"); break; // see above for == 0.0.
-          case JKValueTypeLongLong:         jk_error(parseState, @"The value '%s' exceeded the minimum value that could be represented: %lld.", numberTempBuf, parseState->token.value.number.longLongValue);                                   break;
-          case JKValueTypeUnsignedLongLong: jk_error(parseState, @"The value '%s' exceeded the maximum value that could be represented: %llu.", numberTempBuf, parseState->token.value.number.unsignedLongLongValue);                           break;
-          default:                          jk_error(parseState, @"Internal error: Unknown token value type. %@ line #%ld",                     [NSString stringWithUTF8String:__FILE__], (long)__LINE__);                                      break;
+    
+    parseState->token.tokenPtrRange.ptr    = parseState->stringBuffer.bytes.ptr + startingIndex;
+    parseState->token.tokenPtrRange.length = (atNumberCharacter - parseState->token.tokenPtrRange.ptr) - backup;
+    parseState->atIndex                    = (parseState->token.tokenPtrRange.ptr + parseState->token.tokenPtrRange.length) - parseState->stringBuffer.bytes.ptr;
+    
+    if(JK_EXPECT_T(numberState == JSONNumberStateFinished)) {
+        unsigned char  numberTempBuf[parseState->token.tokenPtrRange.length + 4UL];
+        unsigned char *endOfNumber = NULL;
+        
+        memcpy(numberTempBuf, parseState->token.tokenPtrRange.ptr, parseState->token.tokenPtrRange.length);
+        numberTempBuf[parseState->token.tokenPtrRange.length] = 0;
+        
+        errno = 0;
+        
+        // Treat "-0" as a floating point number, which is capable of representing negative zeros.
+        if(JK_EXPECT_F(parseState->token.tokenPtrRange.length == 2UL) && JK_EXPECT_F(numberTempBuf[1] == '0') && JK_EXPECT_F(isNegative)) { isFloatingPoint = 1; }
+        
+        if(isFloatingPoint) {
+            parseState->token.value.number.doubleValue = strtod((const char *)numberTempBuf, (char **)&endOfNumber); // strtod is documented to return U+2261 (identical to) 0.0 on an underflow error (along with setting errno to ERANGE).
+            parseState->token.value.type               = JKValueTypeDouble;
+            parseState->token.value.ptrRange.ptr       = (const unsigned char *)&parseState->token.value.number.doubleValue;
+            parseState->token.value.ptrRange.length    = sizeof(double);
+            parseState->token.value.hash               = (JK_HASH_INIT + parseState->token.value.type);
+        } else {
+            if(isNegative) {
+                parseState->token.value.number.longLongValue = strtoll((const char *)numberTempBuf, (char **)&endOfNumber, 10);
+                parseState->token.value.type                 = JKValueTypeLongLong;
+                parseState->token.value.ptrRange.ptr         = (const unsigned char *)&parseState->token.value.number.longLongValue;
+                parseState->token.value.ptrRange.length      = sizeof(long long);
+                parseState->token.value.hash                 = (JK_HASH_INIT + parseState->token.value.type) + (JKHash)parseState->token.value.number.longLongValue;
+            } else {
+                parseState->token.value.number.unsignedLongLongValue = strtoull((const char *)numberTempBuf, (char **)&endOfNumber, 10);
+                parseState->token.value.type                         = JKValueTypeUnsignedLongLong;
+                parseState->token.value.ptrRange.ptr                 = (const unsigned char *)&parseState->token.value.number.unsignedLongLongValue;
+                parseState->token.value.ptrRange.length              = sizeof(unsigned long long);
+                parseState->token.value.hash                         = (JK_HASH_INIT + parseState->token.value.type) + (JKHash)parseState->token.value.number.unsignedLongLongValue;
+            }
+        }
+        
+        if(JK_EXPECT_F(errno != 0)) {
+            numberState = JSONNumberStateError;
+            if(errno == ERANGE) {
+                switch(parseState->token.value.type) {
+                    case JKValueTypeDouble:           jk_error(parseState, @"The value '%s' could not be represented as a 'double' due to %s.",           numberTempBuf, (parseState->token.value.number.doubleValue == 0.0) ? "underflow" : "overflow"); break; // see above for == 0.0.
+                    case JKValueTypeLongLong:         jk_error(parseState, @"The value '%s' exceeded the minimum value that could be represented: %lld.", numberTempBuf, parseState->token.value.number.longLongValue);                                   break;
+                    case JKValueTypeUnsignedLongLong: jk_error(parseState, @"The value '%s' exceeded the maximum value that could be represented: %llu.", numberTempBuf, parseState->token.value.number.unsignedLongLongValue);                           break;
+                    default:                          jk_error(parseState, @"Internal error: Unknown token value type. %@ line #%ld",                     [NSString stringWithUTF8String:__FILE__], (long)__LINE__);                                      break;
+                }
+            }
         }
-      }
+        if(JK_EXPECT_F(endOfNumber != &numberTempBuf[parseState->token.tokenPtrRange.length]) && JK_EXPECT_F(numberState != JSONNumberStateError)) { numberState = JSONNumberStateError; jk_error(parseState, @"The conversion function did not consume all of the number tokens characters."); }
+        
+        size_t hashIndex = 0UL;
+        for(hashIndex = 0UL; hashIndex < parseState->token.value.ptrRange.length; hashIndex++) { parseState->token.value.hash = jk_calculateHash(parseState->token.value.hash, parseState->token.value.ptrRange.ptr[hashIndex]); }
     }
-    if(JK_EXPECT_F(endOfNumber != &numberTempBuf[parseState->token.tokenPtrRange.length]) && JK_EXPECT_F(numberState != JSONNumberStateError)) { numberState = JSONNumberStateError; jk_error(parseState, @"The conversion function did not consume all of the number tokens characters."); }
-
-    size_t hashIndex = 0UL;
-    for(hashIndex = 0UL; hashIndex < parseState->token.value.ptrRange.length; hashIndex++) { parseState->token.value.hash = jk_calculateHash(parseState->token.value.hash, parseState->token.value.ptrRange.ptr[hashIndex]); }
-  }
-
-  if(JK_EXPECT_F(numberState != JSONNumberStateFinished)) { jk_error(parseState, @"Invalid number."); }
-  return(JK_EXPECT_T((numberState == JSONNumberStateFinished)) ? 0 : 1);
+    
+    if(JK_EXPECT_F(numberState != JSONNumberStateFinished)) { jk_error(parseState, @"Invalid number."); }
+    return(JK_EXPECT_T((numberState == JSONNumberStateFinished)) ? 0 : 1);
 }
 
 JK_STATIC_INLINE void jk_set_parsed_token(JKParseState *parseState, const unsigned char *ptr, size_t length, JKTokenType type, size_t advanceBy) {
-  parseState->token.tokenPtrRange.ptr     = ptr;
-  parseState->token.tokenPtrRange.length  = length;
-  parseState->token.type                  = type;
-  parseState->atIndex                    += advanceBy;
+    parseState->token.tokenPtrRange.ptr     = ptr;
+    parseState->token.tokenPtrRange.length  = length;
+    parseState->token.type                  = type;
+    parseState->atIndex                    += advanceBy;
 }
 
 static size_t jk_parse_is_newline(JKParseState *parseState, const unsigned char *atCharacterPtr) {
-  NSCParameterAssert((parseState != NULL) && (atCharacterPtr != NULL) && (atCharacterPtr >= parseState->stringBuffer.bytes.ptr) && (atCharacterPtr < JK_END_STRING_PTR(parseState)));
-  const unsigned char *endOfStringPtr = JK_END_STRING_PTR(parseState);
-
-  if(JK_EXPECT_F(atCharacterPtr >= endOfStringPtr)) { return(0UL); }
-
-  if(JK_EXPECT_F((*(atCharacterPtr + 0)) == '\n')) { return(1UL); }
-  if(JK_EXPECT_F((*(atCharacterPtr + 0)) == '\r')) { if((JK_EXPECT_T((atCharacterPtr + 1) < endOfStringPtr)) && ((*(atCharacterPtr + 1)) == '\n')) { return(2UL); } return(1UL); }
-  if(parseState->parseOptionFlags & JKParseOptionUnicodeNewlines) {
-    if((JK_EXPECT_F((*(atCharacterPtr + 0)) == 0xc2)) && (((atCharacterPtr + 1) < endOfStringPtr) && ((*(atCharacterPtr + 1)) == 0x85))) { return(2UL); }
-    if((JK_EXPECT_F((*(atCharacterPtr + 0)) == 0xe2)) && (((atCharacterPtr + 2) < endOfStringPtr) && ((*(atCharacterPtr + 1)) == 0x80) && (((*(atCharacterPtr + 2)) == 0xa8) || ((*(atCharacterPtr + 2)) == 0xa9)))) { return(3UL); }
-  }
-
-  return(0UL);
+    NSCParameterAssert((parseState != NULL) && (atCharacterPtr != NULL) && (atCharacterPtr >= parseState->stringBuffer.bytes.ptr) && (atCharacterPtr < JK_END_STRING_PTR(parseState)));
+    const unsigned char *endOfStringPtr = JK_END_STRING_PTR(parseState);
+    
+    if(JK_EXPECT_F(atCharacterPtr >= endOfStringPtr)) { return(0UL); }
+    
+    if(JK_EXPECT_F((*(atCharacterPtr + 0)) == '\n')) { return(1UL); }
+    if(JK_EXPECT_F((*(atCharacterPtr + 0)) == '\r')) { if((JK_EXPECT_T((atCharacterPtr + 1) < endOfStringPtr)) && ((*(atCharacterPtr + 1)) == '\n')) { return(2UL); } return(1UL); }
+    if(parseState->parseOptionFlags & JKParseOptionUnicodeNewlines) {
+        if((JK_EXPECT_F((*(atCharacterPtr + 0)) == 0xc2)) && (((atCharacterPtr + 1) < endOfStringPtr) && ((*(atCharacterPtr + 1)) == 0x85))) { return(2UL); }
+        if((JK_EXPECT_F((*(atCharacterPtr + 0)) == 0xe2)) && (((atCharacterPtr + 2) < endOfStringPtr) && ((*(atCharacterPtr + 1)) == 0x80) && (((*(atCharacterPtr + 2)) == 0xa8) || ((*(atCharacterPtr + 2)) == 0xa9)))) { return(3UL); }
+    }
+    
+    return(0UL);
 }
 
 JK_STATIC_INLINE int jk_parse_skip_newline(JKParseState *parseState) {
-  size_t newlineAdvanceAtIndex = 0UL;
-  if(JK_EXPECT_F((newlineAdvanceAtIndex = jk_parse_is_newline(parseState, JK_AT_STRING_PTR(parseState))) > 0UL)) { parseState->lineNumber++; parseState->atIndex += (newlineAdvanceAtIndex - 1UL); parseState->lineStartIndex = parseState->atIndex + 1UL; return(1); }
-  return(0);
+    size_t newlineAdvanceAtIndex = 0UL;
+    if(JK_EXPECT_F((newlineAdvanceAtIndex = jk_parse_is_newline(parseState, JK_AT_STRING_PTR(parseState))) > 0UL)) { parseState->lineNumber++; parseState->atIndex += (newlineAdvanceAtIndex - 1UL); parseState->lineStartIndex = parseState->atIndex + 1UL; return(1); }
+    return(0);
 }
 
 JK_STATIC_INLINE void jk_parse_skip_whitespace(JKParseState *parseState) {
 #ifndef __clang_analyzer__
-  NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
-  const unsigned char *atCharacterPtr   = NULL;
-  const unsigned char *endOfStringPtr   = JK_END_STRING_PTR(parseState);
-
-  for(atCharacterPtr = JK_AT_STRING_PTR(parseState); (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr)); parseState->atIndex++) {
-    if(((*(atCharacterPtr + 0)) == ' ') || ((*(atCharacterPtr + 0)) == '\t')) { continue; }
-    if(jk_parse_skip_newline(parseState)) { continue; }
-    if(parseState->parseOptionFlags & JKParseOptionComments) {
-      if((JK_EXPECT_F((*(atCharacterPtr + 0)) == '/')) && (JK_EXPECT_T((atCharacterPtr + 1) < endOfStringPtr))) {
-        if((*(atCharacterPtr + 1)) == '/') {
-          parseState->atIndex++;
-          for(atCharacterPtr = JK_AT_STRING_PTR(parseState); (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr)); parseState->atIndex++) { if(jk_parse_skip_newline(parseState)) { break; } }
-          continue;
-        }
-        if((*(atCharacterPtr + 1)) == '*') {
-          parseState->atIndex++;
-          for(atCharacterPtr = JK_AT_STRING_PTR(parseState); (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr)); parseState->atIndex++) {
-            if(jk_parse_skip_newline(parseState)) { continue; }
-            if(((*(atCharacterPtr + 0)) == '*') && (((atCharacterPtr + 1) < endOfStringPtr) && ((*(atCharacterPtr + 1)) == '/'))) { parseState->atIndex++; break; }
-          }
-          continue;
+    NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
+    const unsigned char *atCharacterPtr   = NULL;
+    const unsigned char *endOfStringPtr   = JK_END_STRING_PTR(parseState);
+    
+    for(atCharacterPtr = JK_AT_STRING_PTR(parseState); (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr)); parseState->atIndex++) {
+        if(((*(atCharacterPtr + 0)) == ' ') || ((*(atCharacterPtr + 0)) == '\t')) { continue; }
+        if(jk_parse_skip_newline(parseState)) { continue; }
+        if(parseState->parseOptionFlags & JKParseOptionComments) {
+            if((JK_EXPECT_F((*(atCharacterPtr + 0)) == '/')) && (JK_EXPECT_T((atCharacterPtr + 1) < endOfStringPtr))) {
+                if((*(atCharacterPtr + 1)) == '/') {
+                    parseState->atIndex++;
+                    for(atCharacterPtr = JK_AT_STRING_PTR(parseState); (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr)); parseState->atIndex++) { if(jk_parse_skip_newline(parseState)) { break; } }
+                    continue;
+                }
+                if((*(atCharacterPtr + 1)) == '*') {
+                    parseState->atIndex++;
+                    for(atCharacterPtr = JK_AT_STRING_PTR(parseState); (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr)); parseState->atIndex++) {
+                        if(jk_parse_skip_newline(parseState)) { continue; }
+                        if(((*(atCharacterPtr + 0)) == '*') && (((atCharacterPtr + 1) < endOfStringPtr) && ((*(atCharacterPtr + 1)) == '/'))) { parseState->atIndex++; break; }
+                    }
+                    continue;
+                }
+            }
         }
-      }
+        break;
     }
-    break;
-  }
 #endif
 }
 
 static int jk_parse_next_token(JKParseState *parseState) {
-  NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
-  const unsigned char *atCharacterPtr   = NULL;
-  const unsigned char *endOfStringPtr   = JK_END_STRING_PTR(parseState);
-  unsigned char        currentCharacter = 0U;
-  int                  stopParsing      = 0;
-
-  parseState->prev_atIndex        = parseState->atIndex;
-  parseState->prev_lineNumber     = parseState->lineNumber;
-  parseState->prev_lineStartIndex = parseState->lineStartIndex;
-
-  jk_parse_skip_whitespace(parseState);
-
-  if((JK_AT_STRING_PTR(parseState) == endOfStringPtr)) { stopParsing = 1; }
-
-  if((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr))) {
-    currentCharacter = *atCharacterPtr;
-
-         if(JK_EXPECT_T(currentCharacter == '"')) { if(JK_EXPECT_T((stopParsing = jk_parse_string(parseState)) == 0)) { jk_set_parsed_token(parseState, parseState->token.tokenPtrRange.ptr, parseState->token.tokenPtrRange.length, JKTokenTypeString, 0UL); } }
-    else if(JK_EXPECT_T(currentCharacter == ':')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeSeparator,   1UL); }
-    else if(JK_EXPECT_T(currentCharacter == ',')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeComma,       1UL); }
-    else if((JK_EXPECT_T(currentCharacter >= '0') && JK_EXPECT_T(currentCharacter <= '9')) || JK_EXPECT_T(currentCharacter == '-')) { if(JK_EXPECT_T((stopParsing = jk_parse_number(parseState)) == 0)) { jk_set_parsed_token(parseState, parseState->token.tokenPtrRange.ptr, parseState->token.tokenPtrRange.length, JKTokenTypeNumber, 0UL); } }
-    else if(JK_EXPECT_T(currentCharacter == '{')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeObjectBegin, 1UL); }
-    else if(JK_EXPECT_T(currentCharacter == '}')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeObjectEnd,   1UL); }
-    else if(JK_EXPECT_T(currentCharacter == '[')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeArrayBegin,  1UL); }
-    else if(JK_EXPECT_T(currentCharacter == ']')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeArrayEnd,    1UL); }
+    NSCParameterAssert((parseState != NULL) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
+    const unsigned char *atCharacterPtr   = NULL;
+    const unsigned char *endOfStringPtr   = JK_END_STRING_PTR(parseState);
+    unsigned char        currentCharacter = 0U;
+    int                  stopParsing      = 0;
     
-    else if(JK_EXPECT_T(currentCharacter == 't')) { if(!((JK_EXPECT_T((atCharacterPtr + 4UL) < endOfStringPtr)) && (JK_EXPECT_T(atCharacterPtr[1] == 'r')) && (JK_EXPECT_T(atCharacterPtr[2] == 'u')) && (JK_EXPECT_T(atCharacterPtr[3] == 'e'))))                                            { stopParsing = 1; /* XXX Add error message */ } else { jk_set_parsed_token(parseState, atCharacterPtr, 4UL, JKTokenTypeTrue,  4UL); } }
-    else if(JK_EXPECT_T(currentCharacter == 'f')) { if(!((JK_EXPECT_T((atCharacterPtr + 5UL) < endOfStringPtr)) && (JK_EXPECT_T(atCharacterPtr[1] == 'a')) && (JK_EXPECT_T(atCharacterPtr[2] == 'l')) && (JK_EXPECT_T(atCharacterPtr[3] == 's')) && (JK_EXPECT_T(atCharacterPtr[4] == 'e')))) { stopParsing = 1; /* XXX Add error message */ } else { jk_set_parsed_token(parseState, atCharacterPtr, 5UL, JKTokenTypeFalse, 5UL); } }
-    else if(JK_EXPECT_T(currentCharacter == 'n')) { if(!((JK_EXPECT_T((atCharacterPtr + 4UL) < endOfStringPtr)) && (JK_EXPECT_T(atCharacterPtr[1] == 'u')) && (JK_EXPECT_T(atCharacterPtr[2] == 'l')) && (JK_EXPECT_T(atCharacterPtr[3] == 'l'))))                                            { stopParsing = 1; /* XXX Add error message */ } else { jk_set_parsed_token(parseState, atCharacterPtr, 4UL, JKTokenTypeNull,  4UL); } }
-    else { stopParsing = 1; /* XXX Add error message */ }    
-  }
-
-  if(JK_EXPECT_F(stopParsing)) { jk_error(parseState, @"Unexpected token, wanted '{', '}', '[', ']', ',', ':', 'true', 'false', 'null', '\"STRING\"', 'NUMBER'."); }
-  return(stopParsing);
+    parseState->prev_atIndex        = parseState->atIndex;
+    parseState->prev_lineNumber     = parseState->lineNumber;
+    parseState->prev_lineStartIndex = parseState->lineStartIndex;
+    
+    jk_parse_skip_whitespace(parseState);
+    
+    if((JK_AT_STRING_PTR(parseState) == endOfStringPtr)) { stopParsing = 1; }
+    
+    if((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((atCharacterPtr = JK_AT_STRING_PTR(parseState)) < endOfStringPtr))) {
+        currentCharacter = *atCharacterPtr;
+        
+        if(JK_EXPECT_T(currentCharacter == '"')) { if(JK_EXPECT_T((stopParsing = jk_parse_string(parseState)) == 0)) { jk_set_parsed_token(parseState, parseState->token.tokenPtrRange.ptr, parseState->token.tokenPtrRange.length, JKTokenTypeString, 0UL); } }
+        else if(JK_EXPECT_T(currentCharacter == ':')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeSeparator,   1UL); }
+        else if(JK_EXPECT_T(currentCharacter == ',')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeComma,       1UL); }
+        else if((JK_EXPECT_T(currentCharacter >= '0') && JK_EXPECT_T(currentCharacter <= '9')) || JK_EXPECT_T(currentCharacter == '-')) { if(JK_EXPECT_T((stopParsing = jk_parse_number(parseState)) == 0)) { jk_set_parsed_token(parseState, parseState->token.tokenPtrRange.ptr, parseState->token.tokenPtrRange.length, JKTokenTypeNumber, 0UL); } }
+        else if(JK_EXPECT_T(currentCharacter == '{')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeObjectBegin, 1UL); }
+        else if(JK_EXPECT_T(currentCharacter == '}')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeObjectEnd,   1UL); }
+        else if(JK_EXPECT_T(currentCharacter == '[')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeArrayBegin,  1UL); }
+        else if(JK_EXPECT_T(currentCharacter == ']')) { jk_set_parsed_token(parseState, atCharacterPtr, 1UL, JKTokenTypeArrayEnd,    1UL); }
+        
+        else if(JK_EXPECT_T(currentCharacter == 't')) { if(!((JK_EXPECT_T((atCharacterPtr + 4UL) < endOfStringPtr)) && (JK_EXPECT_T(atCharacterPtr[1] == 'r')) && (JK_EXPECT_T(atCharacterPtr[2] == 'u')) && (JK_EXPECT_T(atCharacterPtr[3] == 'e'))))                                            { stopParsing = 1; /* XXX Add error message */ } else { jk_set_parsed_token(parseState, atCharacterPtr, 4UL, JKTokenTypeTrue,  4UL); } }
+        else if(JK_EXPECT_T(currentCharacter == 'f')) { if(!((JK_EXPECT_T((atCharacterPtr + 5UL) < endOfStringPtr)) && (JK_EXPECT_T(atCharacterPtr[1] == 'a')) && (JK_EXPECT_T(atCharacterPtr[2] == 'l')) && (JK_EXPECT_T(atCharacterPtr[3] == 's')) && (JK_EXPECT_T(atCharacterPtr[4] == 'e')))) { stopParsing = 1; /* XXX Add error message */ } else { jk_set_parsed_token(parseState, atCharacterPtr, 5UL, JKTokenTypeFalse, 5UL); } }
+        else if(JK_EXPECT_T(currentCharacter == 'n')) { if(!((JK_EXPECT_T((atCharacterPtr + 4UL) < endOfStringPtr)) && (JK_EXPECT_T(atCharacterPtr[1] == 'u')) && (JK_EXPECT_T(atCharacterPtr[2] == 'l')) && (JK_EXPECT_T(atCharacterPtr[3] == 'l'))))                                            { stopParsing = 1; /* XXX Add error message */ } else { jk_set_parsed_token(parseState, atCharacterPtr, 4UL, JKTokenTypeNull,  4UL); } }
+        else { stopParsing = 1; /* XXX Add error message */ }
+    }
+    
+    if(JK_EXPECT_F(stopParsing)) { jk_error(parseState, @"Unexpected token, wanted '{', '}', '[', ']', ',', ':', 'true', 'false', 'null', '\"STRING\"', 'NUMBER'."); }
+    return(stopParsing);
 }
 
 static void jk_error_parse_accept_or3(JKParseState *parseState, int state, NSString *or1String, NSString *or2String, NSString *or3String) {
-  NSString *acceptStrings[16];
-  int acceptIdx = 0;
-  if(state & JKParseAcceptValue) { acceptStrings[acceptIdx++] = or1String; }
-  if(state & JKParseAcceptComma) { acceptStrings[acceptIdx++] = or2String; }
-  if(state & JKParseAcceptEnd)   { acceptStrings[acceptIdx++] = or3String; }
-       if(acceptIdx == 1) { jk_error(parseState, @"Expected %@, not '%*.*s'",           acceptStrings[0],                                     (int)parseState->token.tokenPtrRange.length, (int)parseState->token.tokenPtrRange.length, parseState->token.tokenPtrRange.ptr); }
-  else if(acceptIdx == 2) { jk_error(parseState, @"Expected %@ or %@, not '%*.*s'",     acceptStrings[0], acceptStrings[1],                   (int)parseState->token.tokenPtrRange.length, (int)parseState->token.tokenPtrRange.length, parseState->token.tokenPtrRange.ptr); }
-  else if(acceptIdx == 3) { jk_error(parseState, @"Expected %@, %@, or %@, not '%*.*s", acceptStrings[0], acceptStrings[1], acceptStrings[2], (int)parseState->token.tokenPtrRange.length, (int)parseState->token.tokenPtrRange.length, parseState->token.tokenPtrRange.ptr); }
+    NSString *acceptStrings[16];
+    int acceptIdx = 0;
+    if(state & JKParseAcceptValue) { acceptStrings[acceptIdx++] = or1String; }
+    if(state & JKParseAcceptComma) { acceptStrings[acceptIdx++] = or2String; }
+    if(state & JKParseAcceptEnd)   { acceptStrings[acceptIdx++] = or3String; }
+    if(acceptIdx == 1) { jk_error(parseState, @"Expected %@, not '%*.*s'",           acceptStrings[0],                                     (int)parseState->token.tokenPtrRange.length, (int)parseState->token.tokenPtrRange.length, parseState->token.tokenPtrRange.ptr); }
+    else if(acceptIdx == 2) { jk_error(parseState, @"Expected %@ or %@, not '%*.*s'",     acceptStrings[0], acceptStrings[1],                   (int)parseState->token.tokenPtrRange.length, (int)parseState->token.tokenPtrRange.length, parseState->token.tokenPtrRange.ptr); }
+    else if(acceptIdx == 3) { jk_error(parseState, @"Expected %@, %@, or %@, not '%*.*s", acceptStrings[0], acceptStrings[1], acceptStrings[2], (int)parseState->token.tokenPtrRange.length, (int)parseState->token.tokenPtrRange.length, parseState->token.tokenPtrRange.ptr); }
 }
 
 static void *jk_parse_array(JKParseState *parseState) {
-  size_t  startingObjectIndex = parseState->objectStack.index;
-  int     arrayState          = JKParseAcceptValueOrEnd, stopParsing = 0;
-  void   *parsedArray         = NULL;
-
-  while(JK_EXPECT_T((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T(parseState->atIndex < parseState->stringBuffer.bytes.length)))) {
-    if(JK_EXPECT_F(parseState->objectStack.index > (parseState->objectStack.count - 4UL))) { if(jk_objectStack_resize(&parseState->objectStack, parseState->objectStack.count + 128UL)) { jk_error(parseState, @"Internal error: [array] objectsIndex > %zu, resize failed? %@ line %#ld", (parseState->objectStack.count - 4UL), [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break; } }
-
-    if(JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0)) {
-      void *object = NULL;
+    size_t  startingObjectIndex = parseState->objectStack.index;
+    int     arrayState          = JKParseAcceptValueOrEnd, stopParsing = 0;
+    void   *parsedArray         = NULL;
+    
+    while(JK_EXPECT_T((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T(parseState->atIndex < parseState->stringBuffer.bytes.length)))) {
+        if(JK_EXPECT_F(parseState->objectStack.index > (parseState->objectStack.count - 4UL))) { if(jk_objectStack_resize(&parseState->objectStack, parseState->objectStack.count + 128UL)) { jk_error(parseState, @"Internal error: [array] objectsIndex > %zu, resize failed? %@ line %#ld", (parseState->objectStack.count - 4UL), [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break; } }
+        
+        if(JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0)) {
+            void *object = NULL;
 #ifndef NS_BLOCK_ASSERTIONS
-      parseState->objectStack.objects[parseState->objectStack.index] = NULL;
-      parseState->objectStack.keys   [parseState->objectStack.index] = NULL;
+            parseState->objectStack.objects[parseState->objectStack.index] = NULL;
+            parseState->objectStack.keys   [parseState->objectStack.index] = NULL;
 #endif
-      switch(parseState->token.type) {
-        case JKTokenTypeNumber:
-        case JKTokenTypeString:
-        case JKTokenTypeTrue:
-        case JKTokenTypeFalse:
-        case JKTokenTypeNull:
-        case JKTokenTypeArrayBegin:
-        case JKTokenTypeObjectBegin:
-          if(JK_EXPECT_F((arrayState & JKParseAcceptValue)          == 0))    { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected value.");              stopParsing = 1; break; }
-          if(JK_EXPECT_F((object = jk_object_for_token(parseState)) == NULL)) {                              jk_error(parseState, @"Internal error: Object == NULL"); stopParsing = 1; break; } else { parseState->objectStack.objects[parseState->objectStack.index++] = object; arrayState = JKParseAcceptCommaOrEnd; }
-          break;
-        case JKTokenTypeArrayEnd: if(JK_EXPECT_T(arrayState & JKParseAcceptEnd)) { NSCParameterAssert(parseState->objectStack.index >= startingObjectIndex); parsedArray = (void *)_JKArrayCreate((id *)&parseState->objectStack.objects[startingObjectIndex], (parseState->objectStack.index - startingObjectIndex), parseState->mutableCollections); } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected ']'."); } stopParsing = 1; break;
-        case JKTokenTypeComma:    if(JK_EXPECT_T(arrayState & JKParseAcceptComma)) { arrayState = JKParseAcceptValue; } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected ','."); stopParsing = 1; } break;
-        default: parseState->errorIsPrev = 1; jk_error_parse_accept_or3(parseState, arrayState, @"a value", @"a comma", @"a ']'"); stopParsing = 1; break;
-      }
+            switch(parseState->token.type) {
+                case JKTokenTypeNumber:
+                case JKTokenTypeString:
+                case JKTokenTypeTrue:
+                case JKTokenTypeFalse:
+                case JKTokenTypeNull:
+                case JKTokenTypeArrayBegin:
+                case JKTokenTypeObjectBegin:
+                    if(JK_EXPECT_F((arrayState & JKParseAcceptValue)          == 0))    { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected value.");              stopParsing = 1; break; }
+                    if(JK_EXPECT_F((object = jk_object_for_token(parseState)) == NULL)) {                              jk_error(parseState, @"Internal error: Object == NULL"); stopParsing = 1; break; } else { parseState->objectStack.objects[parseState->objectStack.index++] = object; arrayState = JKParseAcceptCommaOrEnd; }
+                    break;
+                case JKTokenTypeArrayEnd: if(JK_EXPECT_T(arrayState & JKParseAcceptEnd)) { NSCParameterAssert(parseState->objectStack.index >= startingObjectIndex); parsedArray = (void *)_JKArrayCreate((id *)&parseState->objectStack.objects[startingObjectIndex], (parseState->objectStack.index - startingObjectIndex), parseState->mutableCollections); } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected ']'."); } stopParsing = 1; break;
+                case JKTokenTypeComma:    if(JK_EXPECT_T(arrayState & JKParseAcceptComma)) { arrayState = JKParseAcceptValue; } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected ','."); stopParsing = 1; } break;
+                default: parseState->errorIsPrev = 1; jk_error_parse_accept_or3(parseState, arrayState, @"a value", @"a comma", @"a ']'"); stopParsing = 1; break;
+            }
+        }
     }
-  }
-
-  if(JK_EXPECT_F(parsedArray == NULL)) { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { if(parseState->objectStack.objects[idx] != NULL) { CFRelease(parseState->objectStack.objects[idx]); parseState->objectStack.objects[idx] = NULL; } } }
+    
+    if(JK_EXPECT_F(parsedArray == NULL)) { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { if(parseState->objectStack.objects[idx] != NULL) { CFRelease(parseState->objectStack.objects[idx]); parseState->objectStack.objects[idx] = NULL; } } }
 #if !defined(NS_BLOCK_ASSERTIONS)
-  else { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { parseState->objectStack.objects[idx] = NULL; parseState->objectStack.keys[idx] = NULL; } }
+    else { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { parseState->objectStack.objects[idx] = NULL; parseState->objectStack.keys[idx] = NULL; } }
 #endif
-  
-  parseState->objectStack.index = startingObjectIndex;
-  return(parsedArray);
+    
+    parseState->objectStack.index = startingObjectIndex;
+    return(parsedArray);
 }
 
 static void *jk_create_dictionary(JKParseState *parseState, size_t startingObjectIndex) {
-  void *parsedDictionary = NULL;
-
-  parseState->objectStack.index--;
-
-  parsedDictionary = _JKDictionaryCreate((id *)&parseState->objectStack.keys[startingObjectIndex], (NSUInteger *)&parseState->objectStack.cfHashes[startingObjectIndex], (id *)&parseState->objectStack.objects[startingObjectIndex], (parseState->objectStack.index - startingObjectIndex), parseState->mutableCollections);
-
-  return(parsedDictionary);
+    void *parsedDictionary = NULL;
+    
+    parseState->objectStack.index--;
+    
+    parsedDictionary = _JKDictionaryCreate((id *)&parseState->objectStack.keys[startingObjectIndex], (NSUInteger *)&parseState->objectStack.cfHashes[startingObjectIndex], (id *)&parseState->objectStack.objects[startingObjectIndex], (parseState->objectStack.index - startingObjectIndex), parseState->mutableCollections);
+    
+    return(parsedDictionary);
 }
 
 static void *jk_parse_dictionary(JKParseState *parseState) {
-  size_t  startingObjectIndex = parseState->objectStack.index;
-  int     dictState           = JKParseAcceptValueOrEnd, stopParsing = 0;
-  void   *parsedDictionary    = NULL;
-
-  while(JK_EXPECT_T((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T(parseState->atIndex < parseState->stringBuffer.bytes.length)))) {
-    if(JK_EXPECT_F(parseState->objectStack.index > (parseState->objectStack.count - 4UL))) { if(jk_objectStack_resize(&parseState->objectStack, parseState->objectStack.count + 128UL)) { jk_error(parseState, @"Internal error: [dictionary] objectsIndex > %zu, resize failed? %@ line #%ld", (parseState->objectStack.count - 4UL), [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break; } }
-
-    size_t objectStackIndex = parseState->objectStack.index++;
-    parseState->objectStack.keys[objectStackIndex]    = NULL;
-    parseState->objectStack.objects[objectStackIndex] = NULL;
-    void *key = NULL, *object = NULL;
-
-    if(JK_EXPECT_T((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0)))) {
-      switch(parseState->token.type) {
-        case JKTokenTypeString:
-          if(JK_EXPECT_F((dictState & JKParseAcceptValue)        == 0))    { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected string.");           stopParsing = 1; break; }
-          if(JK_EXPECT_F((key = jk_object_for_token(parseState)) == NULL)) {                              jk_error(parseState, @"Internal error: Key == NULL."); stopParsing = 1; break; }
-          else {
-            parseState->objectStack.keys[objectStackIndex] = key;
-            if(JK_EXPECT_T(parseState->token.value.cacheItem != NULL)) { if(JK_EXPECT_F(parseState->token.value.cacheItem->cfHash == 0UL)) { parseState->token.value.cacheItem->cfHash = CFHash(key); } parseState->objectStack.cfHashes[objectStackIndex] = parseState->token.value.cacheItem->cfHash; }
-            else { parseState->objectStack.cfHashes[objectStackIndex] = CFHash(key); }
-          }
-          break;
-
-        case JKTokenTypeObjectEnd: if((JK_EXPECT_T(dictState & JKParseAcceptEnd)))   { NSCParameterAssert(parseState->objectStack.index >= startingObjectIndex); parsedDictionary = jk_create_dictionary(parseState, startingObjectIndex); } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected '}'."); } stopParsing = 1; break;
-        case JKTokenTypeComma:     if((JK_EXPECT_T(dictState & JKParseAcceptComma))) { dictState = JKParseAcceptValue; parseState->objectStack.index--; continue; } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected ','."); stopParsing = 1; } break;
-
-        default: parseState->errorIsPrev = 1; jk_error_parse_accept_or3(parseState, dictState, @"a \"STRING\"", @"a comma", @"a '}'"); stopParsing = 1; break;
-      }
-    }
-
-    if(JK_EXPECT_T(stopParsing == 0)) {
-      if(JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0)) { if(JK_EXPECT_F(parseState->token.type != JKTokenTypeSeparator)) { parseState->errorIsPrev = 1; jk_error(parseState, @"Expected ':'."); stopParsing = 1; } }
-    }
-
-    if((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0))) {
-      switch(parseState->token.type) {
-        case JKTokenTypeNumber:
-        case JKTokenTypeString:
-        case JKTokenTypeTrue:
-        case JKTokenTypeFalse:
-        case JKTokenTypeNull:
-        case JKTokenTypeArrayBegin:
-        case JKTokenTypeObjectBegin:
-          if(JK_EXPECT_F((dictState & JKParseAcceptValue)           == 0))    { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected value.");               stopParsing = 1; break; }
-          if(JK_EXPECT_F((object = jk_object_for_token(parseState)) == NULL)) {                              jk_error(parseState, @"Internal error: Object == NULL."); stopParsing = 1; break; } else { parseState->objectStack.objects[objectStackIndex] = object; dictState = JKParseAcceptCommaOrEnd; }
-          break;
-        default: parseState->errorIsPrev = 1; jk_error_parse_accept_or3(parseState, dictState, @"a value", @"a comma", @"a '}'"); stopParsing = 1; break;
-      }
+    size_t  startingObjectIndex = parseState->objectStack.index;
+    int     dictState           = JKParseAcceptValueOrEnd, stopParsing = 0;
+    void   *parsedDictionary    = NULL;
+    
+    while(JK_EXPECT_T((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T(parseState->atIndex < parseState->stringBuffer.bytes.length)))) {
+        if(JK_EXPECT_F(parseState->objectStack.index > (parseState->objectStack.count - 4UL))) { if(jk_objectStack_resize(&parseState->objectStack, parseState->objectStack.count + 128UL)) { jk_error(parseState, @"Internal error: [dictionary] objectsIndex > %zu, resize failed? %@ line #%ld", (parseState->objectStack.count - 4UL), [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break; } }
+        
+        size_t objectStackIndex = parseState->objectStack.index++;
+        parseState->objectStack.keys[objectStackIndex]    = NULL;
+        parseState->objectStack.objects[objectStackIndex] = NULL;
+        void *key = NULL, *object = NULL;
+        
+        if(JK_EXPECT_T((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0)))) {
+            switch(parseState->token.type) {
+                case JKTokenTypeString:
+                    if(JK_EXPECT_F((dictState & JKParseAcceptValue)        == 0))    { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected string.");           stopParsing = 1; break; }
+                    if(JK_EXPECT_F((key = jk_object_for_token(parseState)) == NULL)) {                              jk_error(parseState, @"Internal error: Key == NULL."); stopParsing = 1; break; }
+                    else {
+                        parseState->objectStack.keys[objectStackIndex] = key;
+                        if(JK_EXPECT_T(parseState->token.value.cacheItem != NULL)) { if(JK_EXPECT_F(parseState->token.value.cacheItem->cfHash == 0UL)) { parseState->token.value.cacheItem->cfHash = CFHash(key); } parseState->objectStack.cfHashes[objectStackIndex] = parseState->token.value.cacheItem->cfHash; }
+                        else { parseState->objectStack.cfHashes[objectStackIndex] = CFHash(key); }
+                    }
+                    break;
+                    
+                case JKTokenTypeObjectEnd: if((JK_EXPECT_T(dictState & JKParseAcceptEnd)))   { NSCParameterAssert(parseState->objectStack.index >= startingObjectIndex); parsedDictionary = jk_create_dictionary(parseState, startingObjectIndex); } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected '}'."); } stopParsing = 1; break;
+                case JKTokenTypeComma:     if((JK_EXPECT_T(dictState & JKParseAcceptComma))) { dictState = JKParseAcceptValue; parseState->objectStack.index--; continue; } else { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected ','."); stopParsing = 1; } break;
+                    
+                default: parseState->errorIsPrev = 1; jk_error_parse_accept_or3(parseState, dictState, @"a \"STRING\"", @"a comma", @"a '}'"); stopParsing = 1; break;
+            }
+        }
+        
+        if(JK_EXPECT_T(stopParsing == 0)) {
+            if(JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0)) { if(JK_EXPECT_F(parseState->token.type != JKTokenTypeSeparator)) { parseState->errorIsPrev = 1; jk_error(parseState, @"Expected ':'."); stopParsing = 1; } }
+        }
+        
+        if((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0))) {
+            switch(parseState->token.type) {
+                case JKTokenTypeNumber:
+                case JKTokenTypeString:
+                case JKTokenTypeTrue:
+                case JKTokenTypeFalse:
+                case JKTokenTypeNull:
+                case JKTokenTypeArrayBegin:
+                case JKTokenTypeObjectBegin:
+                    if(JK_EXPECT_F((dictState & JKParseAcceptValue)           == 0))    { parseState->errorIsPrev = 1; jk_error(parseState, @"Unexpected value.");               stopParsing = 1; break; }
+                    if(JK_EXPECT_F((object = jk_object_for_token(parseState)) == NULL)) {                              jk_error(parseState, @"Internal error: Object == NULL."); stopParsing = 1; break; } else { parseState->objectStack.objects[objectStackIndex] = object; dictState = JKParseAcceptCommaOrEnd; }
+                    break;
+                default: parseState->errorIsPrev = 1; jk_error_parse_accept_or3(parseState, dictState, @"a value", @"a comma", @"a '}'"); stopParsing = 1; break;
+            }
+        }
     }
-  }
-
-  if(JK_EXPECT_F(parsedDictionary == NULL)) { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { if(parseState->objectStack.keys[idx] != NULL) { CFRelease(parseState->objectStack.keys[idx]); parseState->objectStack.keys[idx] = NULL; } if(parseState->objectStack.objects[idx] != NULL) { CFRelease(parseState->objectStack.objects[idx]); parseState->objectStack.objects[idx] = NULL; } } }
+    
+    if(JK_EXPECT_F(parsedDictionary == NULL)) { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { if(parseState->objectStack.keys[idx] != NULL) { CFRelease(parseState->objectStack.keys[idx]); parseState->objectStack.keys[idx] = NULL; } if(parseState->objectStack.objects[idx] != NULL) { CFRelease(parseState->objectStack.objects[idx]); parseState->objectStack.objects[idx] = NULL; } } }
 #if !defined(NS_BLOCK_ASSERTIONS)
-  else { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { parseState->objectStack.objects[idx] = NULL; parseState->objectStack.keys[idx] = NULL; } }
+    else { size_t idx = 0UL; for(idx = startingObjectIndex; idx < parseState->objectStack.index; idx++) { parseState->objectStack.objects[idx] = NULL; parseState->objectStack.keys[idx] = NULL; } }
 #endif
-
-  parseState->objectStack.index = startingObjectIndex;
-  return(parsedDictionary);
+    
+    parseState->objectStack.index = startingObjectIndex;
+    return(parsedDictionary);
 }
 
 static id json_parse_it(JKParseState *parseState) {
-  id  parsedObject = NULL;
-  int stopParsing  = 0;
-
-  while((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T(parseState->atIndex < parseState->stringBuffer.bytes.length))) {
-    if((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0))) {
-      switch(parseState->token.type) {
-        case JKTokenTypeArrayBegin:
-        case JKTokenTypeObjectBegin: parsedObject = [(id)jk_object_for_token(parseState) autorelease]; stopParsing = 1; break;
-        default:                     jk_error(parseState, @"Expected either '[' or '{'.");             stopParsing = 1; break;
-      }
+    id  parsedObject = NULL;
+    int stopParsing  = 0;
+    
+    while((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T(parseState->atIndex < parseState->stringBuffer.bytes.length))) {
+        if((JK_EXPECT_T(stopParsing == 0)) && (JK_EXPECT_T((stopParsing = jk_parse_next_token(parseState)) == 0))) {
+            switch(parseState->token.type) {
+                case JKTokenTypeArrayBegin:
+                case JKTokenTypeObjectBegin: parsedObject = [(id)jk_object_for_token(parseState) autorelease]; stopParsing = 1; break;
+                default:                     jk_error(parseState, @"Expected either '[' or '{'.");             stopParsing = 1; break;
+            }
+        }
     }
-  }
-
-  NSCParameterAssert((parseState->objectStack.index == 0) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
-
-  if((parsedObject == NULL) && (JK_AT_STRING_PTR(parseState) == JK_END_STRING_PTR(parseState))) { jk_error(parseState, @"Reached the end of the buffer."); }
-  if(parsedObject == NULL) { jk_error(parseState, @"Unable to parse JSON."); }
-
-  if((parsedObject != NULL) && (JK_AT_STRING_PTR(parseState) < JK_END_STRING_PTR(parseState))) {
-    jk_parse_skip_whitespace(parseState);
-    if((parsedObject != NULL) && ((parseState->parseOptionFlags & JKParseOptionPermitTextAfterValidJSON) == 0) && (JK_AT_STRING_PTR(parseState) < JK_END_STRING_PTR(parseState))) {
-      jk_error(parseState, @"A valid JSON object was parsed but there were additional non-white-space characters remaining.");
-      parsedObject = NULL;
+    
+    NSCParameterAssert((parseState->objectStack.index == 0) && (JK_AT_STRING_PTR(parseState) <= JK_END_STRING_PTR(parseState)));
+    
+    if((parsedObject == NULL) && (JK_AT_STRING_PTR(parseState) == JK_END_STRING_PTR(parseState))) { jk_error(parseState, @"Reached the end of the buffer."); }
+    if(parsedObject == NULL) { jk_error(parseState, @"Unable to parse JSON."); }
+    
+    if((parsedObject != NULL) && (JK_AT_STRING_PTR(parseState) < JK_END_STRING_PTR(parseState))) {
+        jk_parse_skip_whitespace(parseState);
+        if((parsedObject != NULL) && ((parseState->parseOptionFlags & JKParseOptionPermitTextAfterValidJSON) == 0) && (JK_AT_STRING_PTR(parseState) < JK_END_STRING_PTR(parseState))) {
+            jk_error(parseState, @"A valid JSON object was parsed but there were additional non-white-space characters remaining.");
+            parsedObject = NULL;
+        }
     }
-  }
-
-  return(parsedObject);
+    
+    return(parsedObject);
 }
 
 ////////////
@@ -1977,9 +1977,9 @@ static id json_parse_it(JKParseState *parseState) {
 // This uses a Galois Linear Feedback Shift Register (LFSR) PRNG to pick which item in the cache to age. It has a period of (2^32)-1.
 // NOTE: A LFSR *MUST* be initialized to a non-zero value and must always have a non-zero value. The LFSR is initalized to 1 in -initWithParseOptions:
 JK_STATIC_INLINE void jk_cache_age(JKParseState *parseState) {
-  NSCParameterAssert((parseState != NULL) && (parseState->cache.prng_lfsr != 0U));
-  parseState->cache.prng_lfsr = (parseState->cache.prng_lfsr >> 1) ^ ((0U - (parseState->cache.prng_lfsr & 1U)) & 0x80200003U);
-  parseState->cache.age[parseState->cache.prng_lfsr & (parseState->cache.count - 1UL)] >>= 1;
+    NSCParameterAssert((parseState != NULL) && (parseState->cache.prng_lfsr != 0U));
+    parseState->cache.prng_lfsr = (parseState->cache.prng_lfsr >> 1) ^ ((0U - (parseState->cache.prng_lfsr & 1U)) & 0x80200003U);
+    parseState->cache.age[parseState->cache.prng_lfsr & (parseState->cache.count - 1UL)] >>= 1;
 }
 
 // The object cache is nothing more than a hash table with open addressing collision resolution that is bounded by JK_CACHE_PROBES attempts.
@@ -1998,80 +1998,80 @@ JK_STATIC_INLINE void jk_cache_age(JKParseState *parseState) {
 // If a value is not found in the cache, and no useable bucket has been found, that value is not added to the cache.
 
 static void *jk_cachedObjects(JKParseState *parseState) {
-  unsigned long  bucket     = parseState->token.value.hash & (parseState->cache.count - 1UL), setBucket = 0UL, useableBucket = 0UL, x = 0UL;
-  void          *parsedAtom = NULL;
-    
-  if(JK_EXPECT_F(parseState->token.value.ptrRange.length == 0UL) && JK_EXPECT_T(parseState->token.value.type == JKValueTypeString)) { return(@""); }
-
-  for(x = 0UL; x < JK_CACHE_PROBES; x++) {
-    if(JK_EXPECT_F(parseState->cache.items[bucket].object == NULL)) { setBucket = 1UL; useableBucket = bucket; break; }
-    
-    if((JK_EXPECT_T(parseState->cache.items[bucket].hash == parseState->token.value.hash)) && (JK_EXPECT_T(parseState->cache.items[bucket].size == parseState->token.value.ptrRange.length)) && (JK_EXPECT_T(parseState->cache.items[bucket].type == parseState->token.value.type)) && (JK_EXPECT_T(parseState->cache.items[bucket].bytes != NULL)) && (JK_EXPECT_T(memcmp(parseState->cache.items[bucket].bytes, parseState->token.value.ptrRange.ptr, parseState->token.value.ptrRange.length) == 0U))) {
-      parseState->cache.age[bucket]     = (((uint32_t)parseState->cache.age[bucket]) + 1U) - (((((uint32_t)parseState->cache.age[bucket]) + 1U) >> 31) ^ 1U);
-      parseState->token.value.cacheItem = &parseState->cache.items[bucket];
-      NSCParameterAssert(parseState->cache.items[bucket].object != NULL);
-      return((void *)CFRetain(parseState->cache.items[bucket].object));
-    } else {
-      if(JK_EXPECT_F(setBucket == 0UL) && JK_EXPECT_F(parseState->cache.age[bucket] == 0U)) { setBucket = 1UL; useableBucket = bucket; }
-      if(JK_EXPECT_F(setBucket == 0UL))                                                     { parseState->cache.age[bucket] >>= 1; jk_cache_age(parseState); jk_cache_age(parseState); }
-      // This is the open addressing function.  The values length and type are used as a form of "double hashing" to distribute values with the same effective value hash across different object cache buckets.
-      // The values type is a prime number that is relatively coprime to the other primes in the set of value types and the number of hash table buckets.
-      bucket = (parseState->token.value.hash + (parseState->token.value.ptrRange.length * (x + 1UL)) + (parseState->token.value.type * (x + 1UL)) + (3UL * (x + 1UL))) & (parseState->cache.count - 1UL);
+    unsigned long  bucket     = parseState->token.value.hash & (parseState->cache.count - 1UL), setBucket = 0UL, useableBucket = 0UL, x = 0UL;
+    void          *parsedAtom = NULL;
+    
+    if(JK_EXPECT_F(parseState->token.value.ptrRange.length == 0UL) && JK_EXPECT_T(parseState->token.value.type == JKValueTypeString)) { return(@""); }
+    
+    for(x = 0UL; x < JK_CACHE_PROBES; x++) {
+        if(JK_EXPECT_F(parseState->cache.items[bucket].object == NULL)) { setBucket = 1UL; useableBucket = bucket; break; }
+        
+        if((JK_EXPECT_T(parseState->cache.items[bucket].hash == parseState->token.value.hash)) && (JK_EXPECT_T(parseState->cache.items[bucket].size == parseState->token.value.ptrRange.length)) && (JK_EXPECT_T(parseState->cache.items[bucket].type == parseState->token.value.type)) && (JK_EXPECT_T(parseState->cache.items[bucket].bytes != NULL)) && (JK_EXPECT_T(memcmp(parseState->cache.items[bucket].bytes, parseState->token.value.ptrRange.ptr, parseState->token.value.ptrRange.length) == 0U))) {
+            parseState->cache.age[bucket]     = (((uint32_t)parseState->cache.age[bucket]) + 1U) - (((((uint32_t)parseState->cache.age[bucket]) + 1U) >> 31) ^ 1U);
+            parseState->token.value.cacheItem = &parseState->cache.items[bucket];
+            NSCParameterAssert(parseState->cache.items[bucket].object != NULL);
+            return((void *)CFRetain(parseState->cache.items[bucket].object));
+        } else {
+            if(JK_EXPECT_F(setBucket == 0UL) && JK_EXPECT_F(parseState->cache.age[bucket] == 0U)) { setBucket = 1UL; useableBucket = bucket; }
+            if(JK_EXPECT_F(setBucket == 0UL))                                                     { parseState->cache.age[bucket] >>= 1; jk_cache_age(parseState); jk_cache_age(parseState); }
+            // This is the open addressing function.  The values length and type are used as a form of "double hashing" to distribute values with the same effective value hash across different object cache buckets.
+            // The values type is a prime number that is relatively coprime to the other primes in the set of value types and the number of hash table buckets.
+            bucket = (parseState->token.value.hash + (parseState->token.value.ptrRange.length * (x + 1UL)) + (parseState->token.value.type * (x + 1UL)) + (3UL * (x + 1UL))) & (parseState->cache.count - 1UL);
+        }
+    }
+    
+    switch(parseState->token.value.type) {
+        case JKValueTypeString:           parsedAtom = (void *)CFStringCreateWithBytes(NULL, parseState->token.value.ptrRange.ptr, parseState->token.value.ptrRange.length, kCFStringEncodingUTF8, 0); break;
+        case JKValueTypeLongLong:         parsedAtom = (void *)CFNumberCreate(NULL, kCFNumberLongLongType, &parseState->token.value.number.longLongValue);                                             break;
+        case JKValueTypeUnsignedLongLong:
+            if(parseState->token.value.number.unsignedLongLongValue <= LLONG_MAX) { parsedAtom = (void *)CFNumberCreate(NULL, kCFNumberLongLongType, &parseState->token.value.number.unsignedLongLongValue); }
+            else { parsedAtom = (void *)parseState->objCImpCache.NSNumberInitWithUnsignedLongLong(parseState->objCImpCache.NSNumberAlloc(parseState->objCImpCache.NSNumberClass, @selector(alloc)), @selector(initWithUnsignedLongLong:), parseState->token.value.number.unsignedLongLongValue); }
+            break;
+        case JKValueTypeDouble:           parsedAtom = (void *)CFNumberCreate(NULL, kCFNumberDoubleType,   &parseState->token.value.number.doubleValue);                                               break;
+        default: jk_error(parseState, @"Internal error: Unknown token value type. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break;
     }
-  }
-  
-  switch(parseState->token.value.type) {
-    case JKValueTypeString:           parsedAtom = (void *)CFStringCreateWithBytes(NULL, parseState->token.value.ptrRange.ptr, parseState->token.value.ptrRange.length, kCFStringEncodingUTF8, 0); break;
-    case JKValueTypeLongLong:         parsedAtom = (void *)CFNumberCreate(NULL, kCFNumberLongLongType, &parseState->token.value.number.longLongValue);                                             break;
-    case JKValueTypeUnsignedLongLong:
-      if(parseState->token.value.number.unsignedLongLongValue <= LLONG_MAX) { parsedAtom = (void *)CFNumberCreate(NULL, kCFNumberLongLongType, &parseState->token.value.number.unsignedLongLongValue); }
-      else { parsedAtom = (void *)parseState->objCImpCache.NSNumberInitWithUnsignedLongLong(parseState->objCImpCache.NSNumberAlloc(parseState->objCImpCache.NSNumberClass, @selector(alloc)), @selector(initWithUnsignedLongLong:), parseState->token.value.number.unsignedLongLongValue); }
-      break;
-    case JKValueTypeDouble:           parsedAtom = (void *)CFNumberCreate(NULL, kCFNumberDoubleType,   &parseState->token.value.number.doubleValue);                                               break;
-    default: jk_error(parseState, @"Internal error: Unknown token value type. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break;
-  }
-  
-  if(JK_EXPECT_T(setBucket) && (JK_EXPECT_T(parsedAtom != NULL))) {
-    bucket = useableBucket;
-    if(JK_EXPECT_T((parseState->cache.items[bucket].object != NULL))) { CFRelease(parseState->cache.items[bucket].object); parseState->cache.items[bucket].object = NULL; }
-    
-    if(JK_EXPECT_T((parseState->cache.items[bucket].bytes = (unsigned char *)reallocf(parseState->cache.items[bucket].bytes, parseState->token.value.ptrRange.length)) != NULL)) {
-      memcpy(parseState->cache.items[bucket].bytes, parseState->token.value.ptrRange.ptr, parseState->token.value.ptrRange.length);
-      parseState->cache.items[bucket].object = (void *)CFRetain(parsedAtom);
-      parseState->cache.items[bucket].hash   = parseState->token.value.hash;
-      parseState->cache.items[bucket].cfHash = 0UL;
-      parseState->cache.items[bucket].size   = parseState->token.value.ptrRange.length;
-      parseState->cache.items[bucket].type   = parseState->token.value.type;
-      parseState->token.value.cacheItem      = &parseState->cache.items[bucket];
-      parseState->cache.age[bucket]          = JK_INIT_CACHE_AGE;
-    } else { // The realloc failed, so clear the appropriate fields.
-      parseState->cache.items[bucket].hash   = 0UL;
-      parseState->cache.items[bucket].cfHash = 0UL;
-      parseState->cache.items[bucket].size   = 0UL;
-      parseState->cache.items[bucket].type   = 0UL;
+    
+    if(JK_EXPECT_T(setBucket) && (JK_EXPECT_T(parsedAtom != NULL))) {
+        bucket = useableBucket;
+        if(JK_EXPECT_T((parseState->cache.items[bucket].object != NULL))) { CFRelease(parseState->cache.items[bucket].object); parseState->cache.items[bucket].object = NULL; }
+        
+        if(JK_EXPECT_T((parseState->cache.items[bucket].bytes = (unsigned char *)reallocf(parseState->cache.items[bucket].bytes, parseState->token.value.ptrRange.length)) != NULL)) {
+            memcpy(parseState->cache.items[bucket].bytes, parseState->token.value.ptrRange.ptr, parseState->token.value.ptrRange.length);
+            parseState->cache.items[bucket].object = (void *)CFRetain(parsedAtom);
+            parseState->cache.items[bucket].hash   = parseState->token.value.hash;
+            parseState->cache.items[bucket].cfHash = 0UL;
+            parseState->cache.items[bucket].size   = parseState->token.value.ptrRange.length;
+            parseState->cache.items[bucket].type   = parseState->token.value.type;
+            parseState->token.value.cacheItem      = &parseState->cache.items[bucket];
+            parseState->cache.age[bucket]          = JK_INIT_CACHE_AGE;
+        } else { // The realloc failed, so clear the appropriate fields.
+            parseState->cache.items[bucket].hash   = 0UL;
+            parseState->cache.items[bucket].cfHash = 0UL;
+            parseState->cache.items[bucket].size   = 0UL;
+            parseState->cache.items[bucket].type   = 0UL;
+        }
     }
-  }
-  
-  return(parsedAtom);
+    
+    return(parsedAtom);
 }
 
 
 static void *jk_object_for_token(JKParseState *parseState) {
-  void *parsedAtom = NULL;
-  
-  parseState->token.value.cacheItem = NULL;
-  switch(parseState->token.type) {
-    case JKTokenTypeString:      parsedAtom = jk_cachedObjects(parseState);    break;
-    case JKTokenTypeNumber:      parsedAtom = jk_cachedObjects(parseState);    break;
-    case JKTokenTypeObjectBegin: parsedAtom = jk_parse_dictionary(parseState); break;
-    case JKTokenTypeArrayBegin:  parsedAtom = jk_parse_array(parseState);      break;
-    case JKTokenTypeTrue:        parsedAtom = (void *)kCFBooleanTrue;          break;
-    case JKTokenTypeFalse:       parsedAtom = (void *)kCFBooleanFalse;         break;
-    case JKTokenTypeNull:        parsedAtom = (void *)kCFNull;                 break;
-    default: jk_error(parseState, @"Internal error: Unknown token type. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break;
-  }
-  
-  return(parsedAtom);
+    void *parsedAtom = NULL;
+    
+    parseState->token.value.cacheItem = NULL;
+    switch(parseState->token.type) {
+        case JKTokenTypeString:      parsedAtom = jk_cachedObjects(parseState);    break;
+        case JKTokenTypeNumber:      parsedAtom = jk_cachedObjects(parseState);    break;
+        case JKTokenTypeObjectBegin: parsedAtom = jk_parse_dictionary(parseState); break;
+        case JKTokenTypeArrayBegin:  parsedAtom = jk_parse_array(parseState);      break;
+        case JKTokenTypeTrue:        parsedAtom = (void *)kCFBooleanTrue;          break;
+        case JKTokenTypeFalse:       parsedAtom = (void *)kCFBooleanFalse;         break;
+        case JKTokenTypeNull:        parsedAtom = (void *)kCFNull;                 break;
+        default: jk_error(parseState, @"Internal error: Unknown token type. %@ line #%ld", [NSString stringWithUTF8String:__FILE__], (long)__LINE__); break;
+    }
+    
+    return(parsedAtom);
 }
 
 #pragma mark -
@@ -2079,124 +2079,124 @@ @implementation JSONDecoder
 
 + (id)decoder
 {
-  return([self decoderWithParseOptions:JKParseOptionStrict]);
+    return([self decoderWithParseOptions:JKParseOptionStrict]);
 }
 
 + (id)decoderWithParseOptions:(JKParseOptionFlags)parseOptionFlags
 {
-  return([[[self alloc] initWithParseOptions:parseOptionFlags] autorelease]);
+    return([[[self alloc] initWithParseOptions:parseOptionFlags] autorelease]);
 }
 
 - (id)init
 {
-  return([self initWithParseOptions:JKParseOptionStrict]);
+    return([self initWithParseOptions:JKParseOptionStrict]);
 }
 
 - (id)initWithParseOptions:(JKParseOptionFlags)parseOptionFlags
 {
-  if((self = [super init]) == NULL) { return(NULL); }
-
-  if(parseOptionFlags & ~JKParseOptionValidFlags) { [self autorelease]; [NSException raise:NSInvalidArgumentException format:@"Invalid parse options."]; }
-
-  if((parseState = (JKParseState *)calloc(1UL, sizeof(JKParseState))) == NULL) { goto errorExit; }
-
-  parseState->parseOptionFlags = parseOptionFlags;
-  
-  parseState->token.tokenBuffer.roundSizeUpToMultipleOf = 4096UL;
-  parseState->objectStack.roundSizeUpToMultipleOf       = 2048UL;
-
-  parseState->objCImpCache.NSNumberClass                    = _jk_NSNumberClass;
-  parseState->objCImpCache.NSNumberAlloc                    = _jk_NSNumberAllocImp;
-  parseState->objCImpCache.NSNumberInitWithUnsignedLongLong = _jk_NSNumberInitWithUnsignedLongLongImp;
-  
-  parseState->cache.prng_lfsr = 1U;
-  parseState->cache.count     = JK_CACHE_SLOTS;
-  if((parseState->cache.items = (JKTokenCacheItem *)calloc(1UL, sizeof(JKTokenCacheItem) * parseState->cache.count)) == NULL) { goto errorExit; }
-
-  return(self);
-
- errorExit:
-  if(self) { [self autorelease]; self = NULL; }
-  return(NULL);
+    if((self = [super init]) == NULL) { return(NULL); }
+    
+    if(parseOptionFlags & ~JKParseOptionValidFlags) { [self autorelease]; [NSException raise:NSInvalidArgumentException format:@"Invalid parse options."]; }
+    
+    if((parseState = (JKParseState *)calloc(1UL, sizeof(JKParseState))) == NULL) { goto errorExit; }
+    
+    parseState->parseOptionFlags = parseOptionFlags;
+    
+    parseState->token.tokenBuffer.roundSizeUpToMultipleOf = 4096UL;
+    parseState->objectStack.roundSizeUpToMultipleOf       = 2048UL;
+    
+    parseState->objCImpCache.NSNumberClass                    = _jk_NSNumberClass;
+    parseState->objCImpCache.NSNumberAlloc                    = _jk_NSNumberAllocImp;
+    parseState->objCImpCache.NSNumberInitWithUnsignedLongLong = _jk_NSNumberInitWithUnsignedLongLongImp;
+    
+    parseState->cache.prng_lfsr = 1U;
+    parseState->cache.count     = JK_CACHE_SLOTS;
+    if((parseState->cache.items = (JKTokenCacheItem *)calloc(1UL, sizeof(JKTokenCacheItem) * parseState->cache.count)) == NULL) { goto errorExit; }
+    
+    return(self);
+    
+errorExit:
+    if(self) { [self autorelease]; self = NULL; }
+    return(NULL);
 }
 
 // This is here primarily to support the NSString and NSData convenience functions so the autoreleased JSONDecoder can release most of its resources before the pool pops.
 static void _JSONDecoderCleanup(JSONDecoder *decoder) {
-  if((decoder != NULL) && (decoder->parseState != NULL)) {
-    jk_managedBuffer_release(&decoder->parseState->token.tokenBuffer);
-    jk_objectStack_release(&decoder->parseState->objectStack);
-    
-    [decoder clearCache];
-    if(decoder->parseState->cache.items != NULL) { free(decoder->parseState->cache.items); decoder->parseState->cache.items = NULL; }
-    
-    free(decoder->parseState); decoder->parseState = NULL;
-  }
+    if((decoder != NULL) && (decoder->parseState != NULL)) {
+        jk_managedBuffer_release(&decoder->parseState->token.tokenBuffer);
+        jk_objectStack_release(&decoder->parseState->objectStack);
+        
+        [decoder clearCache];
+        if(decoder->parseState->cache.items != NULL) { free(decoder->parseState->cache.items); decoder->parseState->cache.items = NULL; }
+        
+        free(decoder->parseState); decoder->parseState = NULL;
+    }
 }
 
 - (void)dealloc
 {
-  _JSONDecoderCleanup(self);
-  [super dealloc];
+    _JSONDecoderCleanup(self);
+    [super dealloc];
 }
 
 - (void)clearCache
 {
-  if(JK_EXPECT_T(parseState != NULL)) {
-    if(JK_EXPECT_T(parseState->cache.items != NULL)) {
-      size_t idx = 0UL;
-      for(idx = 0UL; idx < parseState->cache.count; idx++) {
-        if(JK_EXPECT_T(parseState->cache.items[idx].object != NULL)) { CFRelease(parseState->cache.items[idx].object); parseState->cache.items[idx].object = NULL; }
-        if(JK_EXPECT_T(parseState->cache.items[idx].bytes  != NULL)) { free(parseState->cache.items[idx].bytes);       parseState->cache.items[idx].bytes  = NULL; }
-        memset(&parseState->cache.items[idx], 0, sizeof(JKTokenCacheItem));
-        parseState->cache.age[idx] = 0U;
-      }
+    if(JK_EXPECT_T(parseState != NULL)) {
+        if(JK_EXPECT_T(parseState->cache.items != NULL)) {
+            size_t idx = 0UL;
+            for(idx = 0UL; idx < parseState->cache.count; idx++) {
+                if(JK_EXPECT_T(parseState->cache.items[idx].object != NULL)) { CFRelease(parseState->cache.items[idx].object); parseState->cache.items[idx].object = NULL; }
+                if(JK_EXPECT_T(parseState->cache.items[idx].bytes  != NULL)) { free(parseState->cache.items[idx].bytes);       parseState->cache.items[idx].bytes  = NULL; }
+                memset(&parseState->cache.items[idx], 0, sizeof(JKTokenCacheItem));
+                parseState->cache.age[idx] = 0U;
+            }
+        }
     }
-  }
 }
 
 // This needs to be completely rewritten.
 static id _JKParseUTF8String(JKParseState *parseState, BOOL mutableCollections, const unsigned char *string, size_t length, NSError **error) {
-  NSCParameterAssert((parseState != NULL) && (string != NULL) && (parseState->cache.prng_lfsr != 0U));
-  parseState->stringBuffer.bytes.ptr    = string;
-  parseState->stringBuffer.bytes.length = length;
-  parseState->atIndex                   = 0UL;
-  parseState->lineNumber                = 1UL;
-  parseState->lineStartIndex            = 0UL;
-  parseState->prev_atIndex              = 0UL;
-  parseState->prev_lineNumber           = 1UL;
-  parseState->prev_lineStartIndex       = 0UL;
-  parseState->error                     = NULL;
-  parseState->errorIsPrev               = 0;
-  parseState->mutableCollections        = (mutableCollections == NO) ? NO : YES;
-  
-  unsigned char stackTokenBuffer[JK_TOKENBUFFER_SIZE] JK_ALIGNED(64);
-  jk_managedBuffer_setToStackBuffer(&parseState->token.tokenBuffer, stackTokenBuffer, sizeof(stackTokenBuffer));
-  
-  void       *stackObjects [JK_STACK_OBJS] JK_ALIGNED(64);
-  void       *stackKeys    [JK_STACK_OBJS] JK_ALIGNED(64);
-  CFHashCode  stackCFHashes[JK_STACK_OBJS] JK_ALIGNED(64);
-  jk_objectStack_setToStackBuffer(&parseState->objectStack, stackObjects, stackKeys, stackCFHashes, JK_STACK_OBJS);
-  
-  id parsedJSON = json_parse_it(parseState);
-  
-  if((error != NULL) && (parseState->error != NULL)) { *error = parseState->error; }
-  
-  jk_managedBuffer_release(&parseState->token.tokenBuffer);
-  jk_objectStack_release(&parseState->objectStack);
-  
-  parseState->stringBuffer.bytes.ptr    = NULL;
-  parseState->stringBuffer.bytes.length = 0UL;
-  parseState->atIndex                   = 0UL;
-  parseState->lineNumber                = 1UL;
-  parseState->lineStartIndex            = 0UL;
-  parseState->prev_atIndex              = 0UL;
-  parseState->prev_lineNumber           = 1UL;
-  parseState->prev_lineStartIndex       = 0UL;
-  parseState->error                     = NULL;
-  parseState->errorIsPrev               = 0;
-  parseState->mutableCollections        = NO;
-  
-  return(parsedJSON);
+    NSCParameterAssert((parseState != NULL) && (string != NULL) && (parseState->cache.prng_lfsr != 0U));
+    parseState->stringBuffer.bytes.ptr    = string;
+    parseState->stringBuffer.bytes.length = length;
+    parseState->atIndex                   = 0UL;
+    parseState->lineNumber                = 1UL;
+    parseState->lineStartIndex            = 0UL;
+    parseState->prev_atIndex              = 0UL;
+    parseState->prev_lineNumber           = 1UL;
+    parseState->prev_lineStartIndex       = 0UL;
+    parseState->error                     = NULL;
+    parseState->errorIsPrev               = 0;
+    parseState->mutableCollections        = (mutableCollections == NO) ? NO : YES;
+    
+    unsigned char stackTokenBuffer[JK_TOKENBUFFER_SIZE] JK_ALIGNED(64);
+    jk_managedBuffer_setToStackBuffer(&parseState->token.tokenBuffer, stackTokenBuffer, sizeof(stackTokenBuffer));
+    
+    void       *stackObjects [JK_STACK_OBJS] JK_ALIGNED(64);
+    void       *stackKeys    [JK_STACK_OBJS] JK_ALIGNED(64);
+    CFHashCode  stackCFHashes[JK_STACK_OBJS] JK_ALIGNED(64);
+    jk_objectStack_setToStackBuffer(&parseState->objectStack, stackObjects, stackKeys, stackCFHashes, JK_STACK_OBJS);
+    
+    id parsedJSON = json_parse_it(parseState);
+    
+    if((error != NULL) && (parseState->error != NULL)) { *error = parseState->error; }
+    
+    jk_managedBuffer_release(&parseState->token.tokenBuffer);
+    jk_objectStack_release(&parseState->objectStack);
+    
+    parseState->stringBuffer.bytes.ptr    = NULL;
+    parseState->stringBuffer.bytes.length = 0UL;
+    parseState->atIndex                   = 0UL;
+    parseState->lineNumber                = 1UL;
+    parseState->lineStartIndex            = 0UL;
+    parseState->prev_atIndex              = 0UL;
+    parseState->prev_lineNumber           = 1UL;
+    parseState->prev_lineStartIndex       = 0UL;
+    parseState->error                     = NULL;
+    parseState->errorIsPrev               = 0;
+    parseState->mutableCollections        = NO;
+    
+    return(parsedJSON);
 }
 
 ////////////
@@ -2206,25 +2206,25 @@ static id _JKParseUTF8String(JKParseState *parseState, BOOL mutableCollections,
 // Deprecated in JSONKit v1.4.  Use objectWithUTF8String:length: instead.
 - (id)parseUTF8String:(const unsigned char *)string length:(size_t)length
 {
-  return([self objectWithUTF8String:string length:length error:NULL]);
+    return([self objectWithUTF8String:string length:length error:NULL]);
 }
 
 // Deprecated in JSONKit v1.4.  Use objectWithUTF8String:length:error: instead.
 - (id)parseUTF8String:(const unsigned char *)string length:(size_t)length error:(NSError **)error
 {
-  return([self objectWithUTF8String:string length:length error:error]);
+    return([self objectWithUTF8String:string length:length error:error]);
 }
 
 // Deprecated in JSONKit v1.4.  Use objectWithData: instead.
 - (id)parseJSONData:(NSData *)jsonData
 {
-  return([self objectWithData:jsonData error:NULL]);
+    return([self objectWithData:jsonData error:NULL]);
 }
 
 // Deprecated in JSONKit v1.4.  Use objectWithData:error: instead.
 - (id)parseJSONData:(NSData *)jsonData error:(NSError **)error
 {
-  return([self objectWithData:jsonData error:error]);
+    return([self objectWithData:jsonData error:error]);
 }
 
 ////////////
@@ -2233,26 +2233,26 @@ - (id)parseJSONData:(NSData *)jsonData error:(NSError **)error
 
 - (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length
 {
-  return([self objectWithUTF8String:string length:length error:NULL]);
+    return([self objectWithUTF8String:string length:length error:NULL]);
 }
 
 - (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length error:(NSError **)error
 {
-  if(parseState == NULL) { [NSException raise:NSInternalInconsistencyException format:@"parseState is NULL."];          }
-  if(string     == NULL) { [NSException raise:NSInvalidArgumentException       format:@"The string argument is NULL."]; }
-  
-  return(_JKParseUTF8String(parseState, NO, string, (size_t)length, error));
+    if(parseState == NULL) { [NSException raise:NSInternalInconsistencyException format:@"parseState is NULL."];          }
+    if(string     == NULL) { [NSException raise:NSInvalidArgumentException       format:@"The string argument is NULL."]; }
+    
+    return(_JKParseUTF8String(parseState, NO, string, (size_t)length, error));
 }
 
 - (id)objectWithData:(NSData *)jsonData
 {
-  return([self objectWithData:jsonData error:NULL]);
+    return([self objectWithData:jsonData error:NULL]);
 }
 
 - (id)objectWithData:(NSData *)jsonData error:(NSError **)error
 {
-  if(jsonData == NULL) { [NSException raise:NSInvalidArgumentException format:@"The jsonData argument is NULL."]; }
-  return([self objectWithUTF8String:(const unsigned char *)[jsonData bytes] length:[jsonData length] error:error]);
+    if(jsonData == NULL) { [NSException raise:NSInvalidArgumentException format:@"The jsonData argument is NULL."]; }
+    return([self objectWithUTF8String:(const unsigned char *)[jsonData bytes] length:[jsonData length] error:error]);
 }
 
 ////////////
@@ -2261,26 +2261,26 @@ - (id)objectWithData:(NSData *)jsonData error:(NSError **)error
 
 - (id)mutableObjectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length
 {
-  return([self mutableObjectWithUTF8String:string length:length error:NULL]);
+    return([self mutableObjectWithUTF8String:string length:length error:NULL]);
 }
 
 - (id)mutableObjectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length error:(NSError **)error
 {
-  if(parseState == NULL) { [NSException raise:NSInternalInconsistencyException format:@"parseState is NULL."];          }
-  if(string     == NULL) { [NSException raise:NSInvalidArgumentException       format:@"The string argument is NULL."]; }
-  
-  return(_JKParseUTF8String(parseState, YES, string, (size_t)length, error));
+    if(parseState == NULL) { [NSException raise:NSInternalInconsistencyException format:@"parseState is NULL."];          }
+    if(string     == NULL) { [NSException raise:NSInvalidArgumentException       format:@"The string argument is NULL."]; }
+    
+    return(_JKParseUTF8String(parseState, YES, string, (size_t)length, error));
 }
 
 - (id)mutableObjectWithData:(NSData *)jsonData
 {
-  return([self mutableObjectWithData:jsonData error:NULL]);
+    return([self mutableObjectWithData:jsonData error:NULL]);
 }
 
 - (id)mutableObjectWithData:(NSData *)jsonData error:(NSError **)error
 {
-  if(jsonData == NULL) { [NSException raise:NSInvalidArgumentException format:@"The jsonData argument is NULL."]; }
-  return([self mutableObjectWithUTF8String:(const unsigned char *)[jsonData bytes] length:[jsonData length] error:error]);
+    if(jsonData == NULL) { [NSException raise:NSInvalidArgumentException format:@"The jsonData argument is NULL."]; }
+    return([self mutableObjectWithUTF8String:(const unsigned char *)[jsonData bytes] length:[jsonData length] error:error]);
 }
 
 @end
@@ -2292,7 +2292,7 @@ - (id)mutableObjectWithData:(NSData *)jsonData error:(NSError **)error
  
  const unsigned char *utf8String = (const unsigned char *)[self UTF8String];
  if(utf8String == NULL) { return(NULL); }
- size_t               utf8Length = strlen((const char *)utf8String); 
+ size_t               utf8Length = strlen((const char *)utf8String);
  return([[JSONDecoder decoderWithParseOptions:parseOptionFlags] parseUTF8String:utf8String length:utf8Length error:error]);
  
  This changed with v1.4 to a more complicated method.  The reason for this is to keep the amount of memory that is
@@ -2309,7 +2309,7 @@ - (id)mutableObjectWithData:(NSData *)jsonData error:(NSError **)error
  Another change made was a slight modification to JSONDecoder so that most of the cleanup work that was done in -dealloc was moved
  to a private, internal function.  These convenience routines keep the pointer to the autoreleased JSONDecoder and calls
  _JSONDecoderCleanup() to early release the decoders resources since we already know that particular decoder is not going to be used
- again.  
+ again.
  
  If everything goes smoothly, this will most likely result in perhaps a few hundred bytes that are allocated but waiting for the
  autorelease pool to pop.  This is compared to the thousands and easily hundreds of thousands of bytes that would have been in
@@ -2323,59 +2323,59 @@ - (id)mutableObjectWithData:(NSData *)jsonData error:(NSError **)error
 @implementation NSString (JSONKitDeserializing)
 
 static id _NSStringObjectFromJSONString(NSString *jsonString, JKParseOptionFlags parseOptionFlags, NSError **error, BOOL mutableCollection) {
-  id                returnObject = NULL;
-  CFMutableDataRef  mutableData  = NULL;
-  JSONDecoder      *decoder      = NULL;
-  
-  CFIndex    stringLength     = CFStringGetLength((CFStringRef)jsonString);
-  NSUInteger stringUTF8Length = [jsonString lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-  
-  if((mutableData = (CFMutableDataRef)[(id)CFDataCreateMutable(NULL, (NSUInteger)stringUTF8Length) autorelease]) != NULL) {
-    UInt8   *utf8String = CFDataGetMutableBytePtr(mutableData);
-    CFIndex  usedBytes  = 0L, convertedCount = 0L;
-    
-    convertedCount = CFStringGetBytes((CFStringRef)jsonString, CFRangeMake(0L, stringLength), kCFStringEncodingUTF8, '?', NO, utf8String, (NSUInteger)stringUTF8Length, &usedBytes);
-    if(JK_EXPECT_F(convertedCount != stringLength) || JK_EXPECT_F(usedBytes < 0L)) { if(error != NULL) { *error = [NSError errorWithDomain:@"JKErrorDomain" code:-1L userInfo:[NSDictionary dictionaryWithObject:@"An error occurred converting the contents of a NSString to UTF8." forKey:NSLocalizedDescriptionKey]]; } goto exitNow; }
-    
-    if(mutableCollection == NO) { returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags])        objectWithUTF8String:(const unsigned char *)utf8String length:(size_t)usedBytes error:error]; }
-    else                        { returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags]) mutableObjectWithUTF8String:(const unsigned char *)utf8String length:(size_t)usedBytes error:error]; }
-  }
-  
+    id                returnObject = NULL;
+    CFMutableDataRef  mutableData  = NULL;
+    JSONDecoder      *decoder      = NULL;
+    
+    CFIndex    stringLength     = CFStringGetLength((CFStringRef)jsonString);
+    NSUInteger stringUTF8Length = [jsonString lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+    
+    if((mutableData = (CFMutableDataRef)[(id)CFDataCreateMutable(NULL, (NSUInteger)stringUTF8Length) autorelease]) != NULL) {
+        UInt8   *utf8String = CFDataGetMutableBytePtr(mutableData);
+        CFIndex  usedBytes  = 0L, convertedCount = 0L;
+        
+        convertedCount = CFStringGetBytes((CFStringRef)jsonString, CFRangeMake(0L, stringLength), kCFStringEncodingUTF8, '?', NO, utf8String, (NSUInteger)stringUTF8Length, &usedBytes);
+        if(JK_EXPECT_F(convertedCount != stringLength) || JK_EXPECT_F(usedBytes < 0L)) { if(error != NULL) { *error = [NSError errorWithDomain:@"JKErrorDomain" code:-1L userInfo:[NSDictionary dictionaryWithObject:@"An error occurred converting the contents of a NSString to UTF8." forKey:NSLocalizedDescriptionKey]]; } goto exitNow; }
+        
+        if(mutableCollection == NO) { returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags])        objectWithUTF8String:(const unsigned char *)utf8String length:(size_t)usedBytes error:error]; }
+        else                        { returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags]) mutableObjectWithUTF8String:(const unsigned char *)utf8String length:(size_t)usedBytes error:error]; }
+    }
+    
 exitNow:
-  if(mutableData != NULL) { CFDataSetLength(mutableData, 0L); }
-  if(decoder     != NULL) { _JSONDecoderCleanup(decoder);     }
-  return(returnObject);
+    if(mutableData != NULL) { CFDataSetLength(mutableData, 0L); }
+    if(decoder     != NULL) { _JSONDecoderCleanup(decoder);     }
+    return(returnObject);
 }
 
 - (id)objectFromJSONString
 {
-  return([self objectFromJSONStringWithParseOptions:JKParseOptionStrict error:NULL]);
+    return([self objectFromJSONStringWithParseOptions:JKParseOptionStrict error:NULL]);
 }
 
 - (id)objectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags
 {
-  return([self objectFromJSONStringWithParseOptions:parseOptionFlags error:NULL]);
+    return([self objectFromJSONStringWithParseOptions:parseOptionFlags error:NULL]);
 }
 
 - (id)objectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error
 {
-  return(_NSStringObjectFromJSONString(self, parseOptionFlags, error, NO));
+    return(_NSStringObjectFromJSONString(self, parseOptionFlags, error, NO));
 }
 
 
 - (id)mutableObjectFromJSONString
 {
-  return([self mutableObjectFromJSONStringWithParseOptions:JKParseOptionStrict error:NULL]);
+    return([self mutableObjectFromJSONStringWithParseOptions:JKParseOptionStrict error:NULL]);
 }
 
 - (id)mutableObjectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags
 {
-  return([self mutableObjectFromJSONStringWithParseOptions:parseOptionFlags error:NULL]);
+    return([self mutableObjectFromJSONStringWithParseOptions:parseOptionFlags error:NULL]);
 }
 
 - (id)mutableObjectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error
 {
-  return(_NSStringObjectFromJSONString(self, parseOptionFlags, error, YES));
+    return(_NSStringObjectFromJSONString(self, parseOptionFlags, error, YES));
 }
 
 @end
@@ -2384,38 +2384,38 @@ @implementation NSData (JSONKitDeserializing)
 
 - (id)objectFromJSONData
 {
-  return([self objectFromJSONDataWithParseOptions:JKParseOptionStrict error:NULL]);
+    return([self objectFromJSONDataWithParseOptions:JKParseOptionStrict error:NULL]);
 }
 
 - (id)objectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags
 {
-  return([self objectFromJSONDataWithParseOptions:parseOptionFlags error:NULL]);
+    return([self objectFromJSONDataWithParseOptions:parseOptionFlags error:NULL]);
 }
 
 - (id)objectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error
 {
-  JSONDecoder *decoder = NULL;
-  id returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags]) objectWithData:self error:error];
-  if(decoder != NULL) { _JSONDecoderCleanup(decoder); }
-  return(returnObject);
+    JSONDecoder *decoder = NULL;
+    id returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags]) objectWithData:self error:error];
+    if(decoder != NULL) { _JSONDecoderCleanup(decoder); }
+    return(returnObject);
 }
 
 - (id)mutableObjectFromJSONData
 {
-  return([self mutableObjectFromJSONDataWithParseOptions:JKParseOptionStrict error:NULL]);
+    return([self mutableObjectFromJSONDataWithParseOptions:JKParseOptionStrict error:NULL]);
 }
 
 - (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags
 {
-  return([self mutableObjectFromJSONDataWithParseOptions:parseOptionFlags error:NULL]);
+    return([self mutableObjectFromJSONDataWithParseOptions:parseOptionFlags error:NULL]);
 }
 
 - (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error
 {
-  JSONDecoder *decoder = NULL;
-  id returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags]) mutableObjectWithData:self error:error];
-  if(decoder != NULL) { _JSONDecoderCleanup(decoder); }
-  return(returnObject);
+    JSONDecoder *decoder = NULL;
+    id returnObject = [(decoder = [JSONDecoder decoderWithParseOptions:parseOptionFlags]) mutableObjectWithData:self error:error];
+    if(decoder != NULL) { _JSONDecoderCleanup(decoder); }
+    return(returnObject);
 }
 
 
@@ -2426,401 +2426,401 @@ - (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionF
 #pragma mark Encoding / deserializing functions
 
 static void jk_encode_error(JKEncodeState *encodeState, NSString *format, ...) {
-  NSCParameterAssert((encodeState != NULL) && (format != NULL));
-
-  va_list varArgsList;
-  va_start(varArgsList, format);
-  NSString *formatString = [[[NSString alloc] initWithFormat:format arguments:varArgsList] autorelease];
-  va_end(varArgsList);
-
-  if(encodeState->error == NULL) {
-    encodeState->error = [NSError errorWithDomain:@"JKErrorDomain" code:-1L userInfo:
-                                   [NSDictionary dictionaryWithObjectsAndKeys:
-                                                                              formatString, NSLocalizedDescriptionKey,
-                                                                              NULL]];
-  }
+    NSCParameterAssert((encodeState != NULL) && (format != NULL));
+    
+    va_list varArgsList;
+    va_start(varArgsList, format);
+    NSString *formatString = [[[NSString alloc] initWithFormat:format arguments:varArgsList] autorelease];
+    va_end(varArgsList);
+    
+    if(encodeState->error == NULL) {
+        encodeState->error = [NSError errorWithDomain:@"JKErrorDomain" code:-1L userInfo:
+                              [NSDictionary dictionaryWithObjectsAndKeys:
+                               formatString, NSLocalizedDescriptionKey,
+                               NULL]];
+    }
 }
 
 JK_STATIC_INLINE void jk_encode_updateCache(JKEncodeState *encodeState, JKEncodeCache *cacheSlot, size_t startingAtIndex, id object) {
-  NSCParameterAssert(encodeState != NULL);
-  if(JK_EXPECT_T(cacheSlot != NULL)) {
-    NSCParameterAssert((object != NULL) && (startingAtIndex <= encodeState->atIndex));
-    cacheSlot->object = object;
-    cacheSlot->offset = startingAtIndex;
-    cacheSlot->length = (size_t)(encodeState->atIndex - startingAtIndex);  
-  }
+    NSCParameterAssert(encodeState != NULL);
+    if(JK_EXPECT_T(cacheSlot != NULL)) {
+        NSCParameterAssert((object != NULL) && (startingAtIndex <= encodeState->atIndex));
+        cacheSlot->object = object;
+        cacheSlot->offset = startingAtIndex;
+        cacheSlot->length = (size_t)(encodeState->atIndex - startingAtIndex);
+    }
 }
 
 static int jk_encode_printf(JKEncodeState *encodeState, JKEncodeCache *cacheSlot, size_t startingAtIndex, id object, const char *format, ...) {
-  va_list varArgsList, varArgsListCopy;
-  va_start(varArgsList, format);
-  va_copy(varArgsListCopy, varArgsList);
-
-  NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (startingAtIndex <= encodeState->atIndex) && (format != NULL));
-
-  ssize_t  formattedStringLength = 0L;
-  int      returnValue           = 0;
-
-  if(JK_EXPECT_T((formattedStringLength = vsnprintf((char *)&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex], (encodeState->stringBuffer.bytes.length - encodeState->atIndex), format, varArgsList)) >= (ssize_t)(encodeState->stringBuffer.bytes.length - encodeState->atIndex))) {
-    NSCParameterAssert(((encodeState->atIndex + (formattedStringLength * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length));
-    if(JK_EXPECT_F(((encodeState->atIndex + (formattedStringLength * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + (formattedStringLength * 2UL)+ 4096UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); returnValue = 1; goto exitNow; }
-    if(JK_EXPECT_F((formattedStringLength = vsnprintf((char *)&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex], (encodeState->stringBuffer.bytes.length - encodeState->atIndex), format, varArgsListCopy)) >= (ssize_t)(encodeState->stringBuffer.bytes.length - encodeState->atIndex))) { jk_encode_error(encodeState, @"vsnprintf failed unexpectedly."); returnValue = 1; goto exitNow; }
-  }
-  
+    va_list varArgsList, varArgsListCopy;
+    va_start(varArgsList, format);
+    va_copy(varArgsListCopy, varArgsList);
+    
+    NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (startingAtIndex <= encodeState->atIndex) && (format != NULL));
+    
+    ssize_t  formattedStringLength = 0L;
+    int      returnValue           = 0;
+    
+    if(JK_EXPECT_T((formattedStringLength = vsnprintf((char *)&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex], (encodeState->stringBuffer.bytes.length - encodeState->atIndex), format, varArgsList)) >= (ssize_t)(encodeState->stringBuffer.bytes.length - encodeState->atIndex))) {
+        NSCParameterAssert(((encodeState->atIndex + (formattedStringLength * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length));
+        if(JK_EXPECT_F(((encodeState->atIndex + (formattedStringLength * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + (formattedStringLength * 2UL)+ 4096UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); returnValue = 1; goto exitNow; }
+        if(JK_EXPECT_F((formattedStringLength = vsnprintf((char *)&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex], (encodeState->stringBuffer.bytes.length - encodeState->atIndex), format, varArgsListCopy)) >= (ssize_t)(encodeState->stringBuffer.bytes.length - encodeState->atIndex))) { jk_encode_error(encodeState, @"vsnprintf failed unexpectedly."); returnValue = 1; goto exitNow; }
+    }
+    
 exitNow:
-  va_end(varArgsList);
-  va_end(varArgsListCopy);
-  if(JK_EXPECT_T(returnValue == 0)) { encodeState->atIndex += formattedStringLength; jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, object); }
-  return(returnValue);
+    va_end(varArgsList);
+    va_end(varArgsListCopy);
+    if(JK_EXPECT_T(returnValue == 0)) { encodeState->atIndex += formattedStringLength; jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, object); }
+    return(returnValue);
 }
 
 static int jk_encode_write(JKEncodeState *encodeState, JKEncodeCache *cacheSlot, size_t startingAtIndex, id object, const char *format) {
-  NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (startingAtIndex <= encodeState->atIndex) && (format != NULL));
-  if(JK_EXPECT_F(((encodeState->atIndex + strlen(format) + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + strlen(format) + 1024UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
-
-  size_t formatIdx = 0UL;
-  for(formatIdx = 0UL; format[formatIdx] != 0; formatIdx++) { NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length); encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[formatIdx]; }
-  jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, object);
-  return(0);
+    NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (startingAtIndex <= encodeState->atIndex) && (format != NULL));
+    if(JK_EXPECT_F(((encodeState->atIndex + strlen(format) + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + strlen(format) + 1024UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
+    
+    size_t formatIdx = 0UL;
+    for(formatIdx = 0UL; format[formatIdx] != 0; formatIdx++) { NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length); encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[formatIdx]; }
+    jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, object);
+    return(0);
 }
 
 static int jk_encode_writePrettyPrintWhiteSpace(JKEncodeState *encodeState) {
-  NSCParameterAssert((encodeState != NULL) && ((encodeState->serializeOptionFlags & JKSerializeOptionPretty) != 0UL));
-  if(JK_EXPECT_F((encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 16UL) > encodeState->stringBuffer.bytes.length) && JK_EXPECT_T(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 4096UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
-  encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\n';
-  size_t depthWhiteSpace = 0UL;
-  for(depthWhiteSpace = 0UL; depthWhiteSpace < (encodeState->depth * 2UL); depthWhiteSpace++) { NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length); encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = ' '; }
-  return(0);
-}  
+    NSCParameterAssert((encodeState != NULL) && ((encodeState->serializeOptionFlags & JKSerializeOptionPretty) != 0UL));
+    if(JK_EXPECT_F((encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 16UL) > encodeState->stringBuffer.bytes.length) && JK_EXPECT_T(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 4096UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
+    encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\n';
+    size_t depthWhiteSpace = 0UL;
+    for(depthWhiteSpace = 0UL; depthWhiteSpace < (encodeState->depth * 2UL); depthWhiteSpace++) { NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length); encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = ' '; }
+    return(0);
+}
 
 static int jk_encode_write1slow(JKEncodeState *encodeState, ssize_t depthChange, const char *format) {
-  NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (format != NULL) && ((depthChange >= -1L) && (depthChange <= 1L)) && ((encodeState->depth == 0UL) ? (depthChange >= 0L) : 1) && ((encodeState->serializeOptionFlags & JKSerializeOptionPretty) != 0UL));
-  if(JK_EXPECT_F((encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 16UL) > encodeState->stringBuffer.bytes.length) && JK_EXPECT_F(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 4096UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
-  encodeState->depth += depthChange;
-  if(JK_EXPECT_T(format[0] == ':')) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[0]; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = ' '; }
-  else {
-    if(JK_EXPECT_F(depthChange == -1L)) { if(JK_EXPECT_F(jk_encode_writePrettyPrintWhiteSpace(encodeState))) { return(1); } }
-    encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[0];
-    if(JK_EXPECT_T(depthChange != -1L)) { if(JK_EXPECT_F(jk_encode_writePrettyPrintWhiteSpace(encodeState))) { return(1); } }
-  }
-  NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length);
-  return(0);
+    NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (format != NULL) && ((depthChange >= -1L) && (depthChange <= 1L)) && ((encodeState->depth == 0UL) ? (depthChange >= 0L) : 1) && ((encodeState->serializeOptionFlags & JKSerializeOptionPretty) != 0UL));
+    if(JK_EXPECT_F((encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 16UL) > encodeState->stringBuffer.bytes.length) && JK_EXPECT_F(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + ((encodeState->depth + 1UL) * 2UL) + 4096UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
+    encodeState->depth += depthChange;
+    if(JK_EXPECT_T(format[0] == ':')) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[0]; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = ' '; }
+    else {
+        if(JK_EXPECT_F(depthChange == -1L)) { if(JK_EXPECT_F(jk_encode_writePrettyPrintWhiteSpace(encodeState))) { return(1); } }
+        encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[0];
+        if(JK_EXPECT_T(depthChange != -1L)) { if(JK_EXPECT_F(jk_encode_writePrettyPrintWhiteSpace(encodeState))) { return(1); } }
+    }
+    NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length);
+    return(0);
 }
 
 static int jk_encode_write1fast(JKEncodeState *encodeState, ssize_t depthChange JK_UNUSED_ARG, const char *format) {
-  NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && ((encodeState->serializeOptionFlags & JKSerializeOptionPretty) == 0UL));
-  if(JK_EXPECT_T((encodeState->atIndex + 4UL) < encodeState->stringBuffer.bytes.length)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[0]; }
-  else { return(jk_encode_write(encodeState, NULL, 0UL, NULL, format)); }
-  return(0);
+    NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && ((encodeState->serializeOptionFlags & JKSerializeOptionPretty) == 0UL));
+    if(JK_EXPECT_T((encodeState->atIndex + 4UL) < encodeState->stringBuffer.bytes.length)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = format[0]; }
+    else { return(jk_encode_write(encodeState, NULL, 0UL, NULL, format)); }
+    return(0);
 }
 
 static int jk_encode_writen(JKEncodeState *encodeState, JKEncodeCache *cacheSlot, size_t startingAtIndex, id object, const char *format, size_t length) {
-  NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (startingAtIndex <= encodeState->atIndex));
-  if(JK_EXPECT_F((encodeState->stringBuffer.bytes.length - encodeState->atIndex) < (length + 4UL))) { if(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + 4096UL + length) == NULL) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); } }
-  memcpy(encodeState->stringBuffer.bytes.ptr + encodeState->atIndex, format, length);
-  encodeState->atIndex += length;
-  jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, object);
-  return(0);
+    NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (startingAtIndex <= encodeState->atIndex));
+    if(JK_EXPECT_F((encodeState->stringBuffer.bytes.length - encodeState->atIndex) < (length + 4UL))) { if(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + 4096UL + length) == NULL) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); } }
+    memcpy(encodeState->stringBuffer.bytes.ptr + encodeState->atIndex, format, length);
+    encodeState->atIndex += length;
+    jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, object);
+    return(0);
 }
 
 JK_STATIC_INLINE JKHash jk_encode_object_hash(void *objectPtr) {
-  return( ( (((JKHash)objectPtr) >> 21) ^ (((JKHash)objectPtr) >> 9)   ) + (((JKHash)objectPtr) >> 4) );
+    return( ( (((JKHash)objectPtr) >> 21) ^ (((JKHash)objectPtr) >> 9)   ) + (((JKHash)objectPtr) >> 4) );
 }
 
 static int jk_encode_add_atom_to_buffer(JKEncodeState *encodeState, void *objectPtr) {
-  NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (objectPtr != NULL));
-
-  id     object          = (id)objectPtr, encodeCacheObject = object;
-  int    isClass         = JKClassUnknown;
-  size_t startingAtIndex = encodeState->atIndex;
-
-  JKHash         objectHash = jk_encode_object_hash(objectPtr);
-  JKEncodeCache *cacheSlot  = &encodeState->cache[objectHash % JK_ENCODE_CACHE_SLOTS];
-
-  if(JK_EXPECT_T(cacheSlot->object == object)) {
-    NSCParameterAssert((cacheSlot->object != NULL) &&
-                       (cacheSlot->offset < encodeState->atIndex)                   && ((cacheSlot->offset + cacheSlot->length) < encodeState->atIndex)                                    &&
-                       (cacheSlot->offset < encodeState->stringBuffer.bytes.length) && ((cacheSlot->offset + cacheSlot->length) < encodeState->stringBuffer.bytes.length)                  &&
-                       ((encodeState->stringBuffer.bytes.ptr + encodeState->atIndex)                     < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
-                       ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset)                        < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
-                       ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset + cacheSlot->length)    < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)));
-    if(JK_EXPECT_F(((encodeState->atIndex + cacheSlot->length + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + cacheSlot->length + 1024UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
-    NSCParameterAssert(((encodeState->atIndex + cacheSlot->length) < encodeState->stringBuffer.bytes.length) &&
-                       ((encodeState->stringBuffer.bytes.ptr + encodeState->atIndex)                     < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
-                       ((encodeState->stringBuffer.bytes.ptr + encodeState->atIndex + cacheSlot->length) < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
-                       ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset)                        < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
-                       ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset + cacheSlot->length)    < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
-                       ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset + cacheSlot->length)    < (encodeState->stringBuffer.bytes.ptr + encodeState->atIndex)));
-    memcpy(encodeState->stringBuffer.bytes.ptr + encodeState->atIndex, encodeState->stringBuffer.bytes.ptr + cacheSlot->offset, cacheSlot->length);
-    encodeState->atIndex += cacheSlot->length;
-    return(0);
-  }
-
-  // When we encounter a class that we do not handle, and we have either a delegate or block that the user supplied to format unsupported classes,
-  // we "re-run" the object check.  However, we re-run the object check exactly ONCE.  If the user supplies an object that isn't one of the
-  // supported classes, we fail the second time (i.e., double fault error).
-  BOOL rerunningAfterClassFormatter = NO;
- rerunAfterClassFormatter:;
-
-  // XXX XXX XXX XXX
-  //     
-  //     We need to work around a bug in 10.7, which breaks ABI compatibility with Objective-C going back not just to 10.0, but OpenStep and even NextStep.
-  //     
-  //     It has long been documented that "the very first thing that a pointer to an Objective-C object "points to" is a pointer to that objects class".
-  //     
-  //     This is euphemistically called "tagged pointers".  There are a number of highly technical problems with this, most involving long passages from
-  //     the C standard(s).  In short, one can make a strong case, couched from the perspective of the C standard(s), that that 10.7 "tagged pointers" are
-  //     fundamentally Wrong and Broken, and should have never been implemented.  Assuming those points are glossed over, because the change is very clearly
-  //     breaking ABI compatibility, this should have resulted in a minimum of a "minimum version required" bump in various shared libraries to prevent
-  //     causes code that used to work just fine to suddenly break without warning.
-  //
-  //     In fact, the C standard says that the hack below is "undefined behavior"- there is no requirement that the 10.7 tagged pointer hack of setting the
-  //     "lower, unused bits" must be preserved when casting the result to an integer type, but this "works" because for most architectures
-  //     `sizeof(long) == sizeof(void *)` and the compiler uses the same representation for both.  (note: this is informal, not meant to be
-  //     normative or pedantically correct).
-  //     
-  //     In other words, while this "works" for now, technically the compiler is not obligated to do "what we want", and a later version of the compiler
-  //     is not required in any way to produce the same results or behavior that earlier versions of the compiler did for the statement below.
-  //
-  //     Fan-fucking-tastic.
-  //     
-  //     Why not just use `object_getClass()`?  Because `object->isa` reduces to (typically) a *single* instruction.  Calling `object_getClass()` requires
-  //     that the compiler potentially spill registers, establish a function call frame / environment, and finally execute a "jump subroutine" instruction.
-  //     Then, the called subroutine must spend half a dozen instructions in its prolog, however many instructions doing whatever it does, then half a dozen
-  //     instructions in its prolog.  One instruction compared to dozens, maybe a hundred instructions.
-  //     
-  //     Yes, that's one to two orders of magnitude difference.  Which is compelling in its own right.  When going for performance, you're often happy with
-  //     gains in the two to three percent range.
-  //     
-  // XXX XXX XXX XXX
-
-
-  BOOL   workAroundMacOSXABIBreakingBug = (JK_EXPECT_F(((NSUInteger)object) & 0x1))     ? YES  : NO;
-  void  *objectISA                      = (JK_EXPECT_F(workAroundMacOSXABIBreakingBug)) ? NULL : *((void **)objectPtr);
-  if(JK_EXPECT_F(workAroundMacOSXABIBreakingBug)) { goto slowClassLookup; }
-
-       if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.stringClass))     { isClass = JKClassString;     }
-  else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.numberClass))     { isClass = JKClassNumber;     }
-  else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.dictionaryClass)) { isClass = JKClassDictionary; }
-  else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.arrayClass))      { isClass = JKClassArray;      }
-  else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.nullClass))       { isClass = JKClassNull;       }
-  else {
-  slowClassLookup:
-         if(JK_EXPECT_T([object isKindOfClass:[NSString     class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.stringClass     = objectISA; } isClass = JKClassString;     }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSNumber     class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.numberClass     = objectISA; } isClass = JKClassNumber;     }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSDictionary class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.dictionaryClass = objectISA; } isClass = JKClassDictionary; }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSArray      class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.arrayClass      = objectISA; } isClass = JKClassArray;      }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSNull       class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.nullClass       = objectISA; } isClass = JKClassNull;       }
+    NSCParameterAssert((encodeState != NULL) && (encodeState->atIndex < encodeState->stringBuffer.bytes.length) && (objectPtr != NULL));
+    
+    id     object          = (id)objectPtr, encodeCacheObject = object;
+    int    isClass         = JKClassUnknown;
+    size_t startingAtIndex = encodeState->atIndex;
+    
+    JKHash         objectHash = jk_encode_object_hash(objectPtr);
+    JKEncodeCache *cacheSlot  = &encodeState->cache[objectHash % JK_ENCODE_CACHE_SLOTS];
+    
+    if(JK_EXPECT_T(cacheSlot->object == object)) {
+        NSCParameterAssert((cacheSlot->object != NULL) &&
+                           (cacheSlot->offset < encodeState->atIndex)                   && ((cacheSlot->offset + cacheSlot->length) < encodeState->atIndex)                                    &&
+                           (cacheSlot->offset < encodeState->stringBuffer.bytes.length) && ((cacheSlot->offset + cacheSlot->length) < encodeState->stringBuffer.bytes.length)                  &&
+                           ((encodeState->stringBuffer.bytes.ptr + encodeState->atIndex)                     < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
+                           ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset)                        < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
+                           ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset + cacheSlot->length)    < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)));
+        if(JK_EXPECT_F(((encodeState->atIndex + cacheSlot->length + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + cacheSlot->length + 1024UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
+        NSCParameterAssert(((encodeState->atIndex + cacheSlot->length) < encodeState->stringBuffer.bytes.length) &&
+                           ((encodeState->stringBuffer.bytes.ptr + encodeState->atIndex)                     < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
+                           ((encodeState->stringBuffer.bytes.ptr + encodeState->atIndex + cacheSlot->length) < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
+                           ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset)                        < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
+                           ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset + cacheSlot->length)    < (encodeState->stringBuffer.bytes.ptr + encodeState->stringBuffer.bytes.length)) &&
+                           ((encodeState->stringBuffer.bytes.ptr + cacheSlot->offset + cacheSlot->length)    < (encodeState->stringBuffer.bytes.ptr + encodeState->atIndex)));
+        memcpy(encodeState->stringBuffer.bytes.ptr + encodeState->atIndex, encodeState->stringBuffer.bytes.ptr + cacheSlot->offset, cacheSlot->length);
+        encodeState->atIndex += cacheSlot->length;
+        return(0);
+    }
+    
+    // When we encounter a class that we do not handle, and we have either a delegate or block that the user supplied to format unsupported classes,
+    // we "re-run" the object check.  However, we re-run the object check exactly ONCE.  If the user supplies an object that isn't one of the
+    // supported classes, we fail the second time (i.e., double fault error).
+    BOOL rerunningAfterClassFormatter = NO;
+rerunAfterClassFormatter:;
+    
+    // XXX XXX XXX XXX
+    //
+    //     We need to work around a bug in 10.7, which breaks ABI compatibility with Objective-C going back not just to 10.0, but OpenStep and even NextStep.
+    //
+    //     It has long been documented that "the very first thing that a pointer to an Objective-C object "points to" is a pointer to that objects class".
+    //
+    //     This is euphemistically called "tagged pointers".  There are a number of highly technical problems with this, most involving long passages from
+    //     the C standard(s).  In short, one can make a strong case, couched from the perspective of the C standard(s), that that 10.7 "tagged pointers" are
+    //     fundamentally Wrong and Broken, and should have never been implemented.  Assuming those points are glossed over, because the change is very clearly
+    //     breaking ABI compatibility, this should have resulted in a minimum of a "minimum version required" bump in various shared libraries to prevent
+    //     causes code that used to work just fine to suddenly break without warning.
+    //
+    //     In fact, the C standard says that the hack below is "undefined behavior"- there is no requirement that the 10.7 tagged pointer hack of setting the
+    //     "lower, unused bits" must be preserved when casting the result to an integer type, but this "works" because for most architectures
+    //     `sizeof(long) == sizeof(void *)` and the compiler uses the same representation for both.  (note: this is informal, not meant to be
+    //     normative or pedantically correct).
+    //
+    //     In other words, while this "works" for now, technically the compiler is not obligated to do "what we want", and a later version of the compiler
+    //     is not required in any way to produce the same results or behavior that earlier versions of the compiler did for the statement below.
+    //
+    //     Fan-fucking-tastic.
+    //
+    //     Why not just use `object_getClass()`?  Because `object->isa` reduces to (typically) a *single* instruction.  Calling `object_getClass()` requires
+    //     that the compiler potentially spill registers, establish a function call frame / environment, and finally execute a "jump subroutine" instruction.
+    //     Then, the called subroutine must spend half a dozen instructions in its prolog, however many instructions doing whatever it does, then half a dozen
+    //     instructions in its prolog.  One instruction compared to dozens, maybe a hundred instructions.
+    //
+    //     Yes, that's one to two orders of magnitude difference.  Which is compelling in its own right.  When going for performance, you're often happy with
+    //     gains in the two to three percent range.
+    //
+    // XXX XXX XXX XXX
+    
+    
+    BOOL   workAroundMacOSXABIBreakingBug = (JK_EXPECT_F(((NSUInteger)object) & 0x1))     ? YES  : NO;
+    void  *objectISA                      = (JK_EXPECT_F(workAroundMacOSXABIBreakingBug)) ? NULL : object_getClass(objectPtr);
+    if(JK_EXPECT_F(workAroundMacOSXABIBreakingBug)) { goto slowClassLookup; }
+    
+    if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.stringClass))     { isClass = JKClassString;     }
+    else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.numberClass))     { isClass = JKClassNumber;     }
+    else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.dictionaryClass)) { isClass = JKClassDictionary; }
+    else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.arrayClass))      { isClass = JKClassArray;      }
+    else if(JK_EXPECT_T(objectISA == encodeState->fastClassLookup.nullClass))       { isClass = JKClassNull;       }
     else {
-      if((rerunningAfterClassFormatter == NO) && (
+    slowClassLookup:
+        if(JK_EXPECT_T([object isKindOfClass:[NSString     class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.stringClass     = objectISA; } isClass = JKClassString;     }
+        else if(JK_EXPECT_T([object isKindOfClass:[NSNumber     class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.numberClass     = objectISA; } isClass = JKClassNumber;     }
+        else if(JK_EXPECT_T([object isKindOfClass:[NSDictionary class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.dictionaryClass = objectISA; } isClass = JKClassDictionary; }
+        else if(JK_EXPECT_T([object isKindOfClass:[NSArray      class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.arrayClass      = objectISA; } isClass = JKClassArray;      }
+        else if(JK_EXPECT_T([object isKindOfClass:[NSNull       class]])) { if(workAroundMacOSXABIBreakingBug == NO) { encodeState->fastClassLookup.nullClass       = objectISA; } isClass = JKClassNull;       }
+        else {
+            if((rerunningAfterClassFormatter == NO) && (
 #ifdef __BLOCKS__
-           ((encodeState->classFormatterBlock) && ((object = encodeState->classFormatterBlock(object))                                                                         != NULL)) ||
+                                                        ((encodeState->classFormatterBlock) && ((object = encodeState->classFormatterBlock(object))                                                                         != NULL)) ||
 #endif
-           ((encodeState->classFormatterIMP)   && ((object = encodeState->classFormatterIMP(encodeState->classFormatterDelegate, encodeState->classFormatterSelector, object)) != NULL))    )) { rerunningAfterClassFormatter = YES; goto rerunAfterClassFormatter; }
-      
-      if(rerunningAfterClassFormatter == NO) { jk_encode_error(encodeState, @"Unable to serialize object class %@.", NSStringFromClass([encodeCacheObject class])); return(1); }
-      else { jk_encode_error(encodeState, @"Unable to serialize object class %@ that was returned by the unsupported class formatter.  Original object class was %@.", (object == NULL) ? @"NULL" : NSStringFromClass([object class]), NSStringFromClass([encodeCacheObject class])); return(1); }
+                                                        ((encodeState->classFormatterIMP)   && ((object = encodeState->classFormatterIMP(encodeState->classFormatterDelegate, encodeState->classFormatterSelector, object)) != NULL))    )) { rerunningAfterClassFormatter = YES; goto rerunAfterClassFormatter; }
+            
+            if(rerunningAfterClassFormatter == NO) { jk_encode_error(encodeState, @"Unable to serialize object class %@.", NSStringFromClass([encodeCacheObject class])); return(1); }
+            else { jk_encode_error(encodeState, @"Unable to serialize object class %@ that was returned by the unsupported class formatter.  Original object class was %@.", (object == NULL) ? @"NULL" : NSStringFromClass([object class]), NSStringFromClass([encodeCacheObject class])); return(1); }
+        }
     }
-  }
-
-  // This is here for the benefit of the optimizer.  It allows the optimizer to do loop invariant code motion for the JKClassArray
-  // and JKClassDictionary cases when printing simple, single characters via jk_encode_write(), which is actually a macro:
-  // #define jk_encode_write1(es, dc, f) (_jk_encode_prettyPrint ? jk_encode_write1slow(es, dc, f) : jk_encode_write1fast(es, dc, f))
-  int _jk_encode_prettyPrint = JK_EXPECT_T((encodeState->serializeOptionFlags & JKSerializeOptionPretty) == 0) ? 0 : 1;
-  
-  switch(isClass) {
-    case JKClassString:
-      {
+    
+    // This is here for the benefit of the optimizer.  It allows the optimizer to do loop invariant code motion for the JKClassArray
+    // and JKClassDictionary cases when printing simple, single characters via jk_encode_write(), which is actually a macro:
+    // #define jk_encode_write1(es, dc, f) (_jk_encode_prettyPrint ? jk_encode_write1slow(es, dc, f) : jk_encode_write1fast(es, dc, f))
+    int _jk_encode_prettyPrint = JK_EXPECT_T((encodeState->serializeOptionFlags & JKSerializeOptionPretty) == 0) ? 0 : 1;
+    
+    switch(isClass) {
+        case JKClassString:
         {
-          const unsigned char *cStringPtr = (const unsigned char *)CFStringGetCStringPtr((CFStringRef)object, kCFStringEncodingMacRoman);
-          if(cStringPtr != NULL) {
-            const unsigned char *utf8String = cStringPtr;
-            size_t               utf8Idx    = 0UL;
-
-            CFIndex stringLength = CFStringGetLength((CFStringRef)object);
-            if(JK_EXPECT_F(((encodeState->atIndex + (stringLength * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + (stringLength * 2UL) + 1024UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
-
-            if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
-            for(utf8Idx = 0UL; utf8String[utf8Idx] != 0U; utf8Idx++) {
-              NSCParameterAssert(((&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex]) - encodeState->stringBuffer.bytes.ptr) < (ssize_t)encodeState->stringBuffer.bytes.length);
-              NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length);
-              if(JK_EXPECT_F(utf8String[utf8Idx] >= 0x80U)) { encodeState->atIndex = startingAtIndex; goto slowUTF8Path; }
-              if(JK_EXPECT_F(utf8String[utf8Idx] <  0x20U)) {
-                switch(utf8String[utf8Idx]) {
-                  case '\b': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'b'; break;
-                  case '\f': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'f'; break;
-                  case '\n': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'n'; break;
-                  case '\r': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'r'; break;
-                  case '\t': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 't'; break;
-                  default: if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", utf8String[utf8Idx]))) { return(1); } break;
+            {
+                const unsigned char *cStringPtr = (const unsigned char *)CFStringGetCStringPtr((CFStringRef)object, kCFStringEncodingMacRoman);
+                if(cStringPtr != NULL) {
+                    const unsigned char *utf8String = cStringPtr;
+                    size_t               utf8Idx    = 0UL;
+                    
+                    CFIndex stringLength = CFStringGetLength((CFStringRef)object);
+                    if(JK_EXPECT_F(((encodeState->atIndex + (stringLength * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length)) && JK_EXPECT_F((jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + (stringLength * 2UL) + 1024UL) == NULL))) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
+                    
+                    if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
+                    for(utf8Idx = 0UL; utf8String[utf8Idx] != 0U; utf8Idx++) {
+                        NSCParameterAssert(((&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex]) - encodeState->stringBuffer.bytes.ptr) < (ssize_t)encodeState->stringBuffer.bytes.length);
+                        NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length);
+                        if(JK_EXPECT_F(utf8String[utf8Idx] >= 0x80U)) { encodeState->atIndex = startingAtIndex; goto slowUTF8Path; }
+                        if(JK_EXPECT_F(utf8String[utf8Idx] <  0x20U)) {
+                            switch(utf8String[utf8Idx]) {
+                                case '\b': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'b'; break;
+                                case '\f': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'f'; break;
+                                case '\n': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'n'; break;
+                                case '\r': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'r'; break;
+                                case '\t': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 't'; break;
+                                default: if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", utf8String[utf8Idx]))) { return(1); } break;
+                            }
+                        } else {
+                            if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\') || (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
+                            encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];
+                        }
+                    }
+                    NSCParameterAssert((encodeState->atIndex + 1UL) < encodeState->stringBuffer.bytes.length);
+                    if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
+                    jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, encodeCacheObject);
+                    return(0);
+                }
+            }
+            
+        slowUTF8Path:
+            {
+                CFIndex stringLength        = CFStringGetLength((CFStringRef)object);
+                CFIndex maxStringUTF8Length = CFStringGetMaximumSizeForEncoding(stringLength, kCFStringEncodingUTF8) + 32L;
+                
+                if(JK_EXPECT_F((size_t)maxStringUTF8Length > encodeState->utf8ConversionBuffer.bytes.length) && JK_EXPECT_F(jk_managedBuffer_resize(&encodeState->utf8ConversionBuffer, maxStringUTF8Length + 1024UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
+                
+                CFIndex usedBytes = 0L, convertedCount = 0L;
+                convertedCount = CFStringGetBytes((CFStringRef)object, CFRangeMake(0L, stringLength), kCFStringEncodingUTF8, '?', NO, encodeState->utf8ConversionBuffer.bytes.ptr, encodeState->utf8ConversionBuffer.bytes.length - 16L, &usedBytes);
+                if(JK_EXPECT_F(convertedCount != stringLength) || JK_EXPECT_F(usedBytes < 0L)) { jk_encode_error(encodeState, @"An error occurred converting the contents of a NSString to UTF8."); return(1); }
+                
+                if(JK_EXPECT_F((encodeState->atIndex + (maxStringUTF8Length * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length) && JK_EXPECT_F(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + (maxStringUTF8Length * 2UL) + 1024UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
+                
+                const unsigned char *utf8String = encodeState->utf8ConversionBuffer.bytes.ptr;
+                
+                size_t utf8Idx = 0UL;
+                if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
+                for(utf8Idx = 0UL; utf8Idx < (size_t)usedBytes; utf8Idx++) {
+                    NSCParameterAssert(((&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex]) - encodeState->stringBuffer.bytes.ptr) < (ssize_t)encodeState->stringBuffer.bytes.length);
+                    NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length);
+                    NSCParameterAssert((CFIndex)utf8Idx < usedBytes);
+                    if(JK_EXPECT_F(utf8String[utf8Idx] < 0x20U)) {
+                        switch(utf8String[utf8Idx]) {
+                            case '\b': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'b'; break;
+                            case '\f': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'f'; break;
+                            case '\n': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'n'; break;
+                            case '\r': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'r'; break;
+                            case '\t': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 't'; break;
+                            default: if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", utf8String[utf8Idx]))) { return(1); } break;
+                        }
+                    } else {
+                        if(JK_EXPECT_F(utf8String[utf8Idx] >= 0x80U) && (encodeState->serializeOptionFlags & JKSerializeOptionEscapeUnicode)) {
+                            const unsigned char *nextValidCharacter = NULL;
+                            UTF32                u32ch              = 0U;
+                            ConversionResult     result;
+                            
+                            if(JK_EXPECT_F((result = ConvertSingleCodePointInUTF8(&utf8String[utf8Idx], &utf8String[usedBytes], (UTF8 const **)&nextValidCharacter, &u32ch)) != conversionOK)) { jk_encode_error(encodeState, @"Error converting UTF8."); return(1); }
+                            else {
+                                utf8Idx = (nextValidCharacter - utf8String) - 1UL;
+                                if(JK_EXPECT_T(u32ch <= 0xffffU)) { if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", u32ch)))                                                           { return(1); } }
+                                else                              { if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x\\u%4.4x", (0xd7c0U + (u32ch >> 10)), (0xdc00U + (u32ch & 0x3ffU))))) { return(1); } }
+                            }
+                        } else {
+                            if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\') || (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
+                            encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];
+                        }
+                    }
                 }
-              } else {
-                if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\') || (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
-                encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];
-              }
+                NSCParameterAssert((encodeState->atIndex + 1UL) < encodeState->stringBuffer.bytes.length);
+                if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
+                jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, encodeCacheObject);
+                return(0);
             }
-            NSCParameterAssert((encodeState->atIndex + 1UL) < encodeState->stringBuffer.bytes.length);
-            if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
-            jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, encodeCacheObject);
-            return(0);
-          }
         }
-
-      slowUTF8Path:
+            break;
+            
+        case JKClassNumber:
         {
-          CFIndex stringLength        = CFStringGetLength((CFStringRef)object);
-          CFIndex maxStringUTF8Length = CFStringGetMaximumSizeForEncoding(stringLength, kCFStringEncodingUTF8) + 32L;
-        
-          if(JK_EXPECT_F((size_t)maxStringUTF8Length > encodeState->utf8ConversionBuffer.bytes.length) && JK_EXPECT_F(jk_managedBuffer_resize(&encodeState->utf8ConversionBuffer, maxStringUTF8Length + 1024UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
-        
-          CFIndex usedBytes = 0L, convertedCount = 0L;
-          convertedCount = CFStringGetBytes((CFStringRef)object, CFRangeMake(0L, stringLength), kCFStringEncodingUTF8, '?', NO, encodeState->utf8ConversionBuffer.bytes.ptr, encodeState->utf8ConversionBuffer.bytes.length - 16L, &usedBytes);
-          if(JK_EXPECT_F(convertedCount != stringLength) || JK_EXPECT_F(usedBytes < 0L)) { jk_encode_error(encodeState, @"An error occurred converting the contents of a NSString to UTF8."); return(1); }
-        
-          if(JK_EXPECT_F((encodeState->atIndex + (maxStringUTF8Length * 2UL) + 256UL) > encodeState->stringBuffer.bytes.length) && JK_EXPECT_F(jk_managedBuffer_resize(&encodeState->stringBuffer, encodeState->atIndex + (maxStringUTF8Length * 2UL) + 1024UL) == NULL)) { jk_encode_error(encodeState, @"Unable to resize temporary buffer."); return(1); }
-        
-          const unsigned char *utf8String = encodeState->utf8ConversionBuffer.bytes.ptr;
-        
-          size_t utf8Idx = 0UL;
-          if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
-          for(utf8Idx = 0UL; utf8Idx < (size_t)usedBytes; utf8Idx++) {
-            NSCParameterAssert(((&encodeState->stringBuffer.bytes.ptr[encodeState->atIndex]) - encodeState->stringBuffer.bytes.ptr) < (ssize_t)encodeState->stringBuffer.bytes.length);
-            NSCParameterAssert(encodeState->atIndex < encodeState->stringBuffer.bytes.length);
-            NSCParameterAssert((CFIndex)utf8Idx < usedBytes);
-            if(JK_EXPECT_F(utf8String[utf8Idx] < 0x20U)) {
-              switch(utf8String[utf8Idx]) {
-                case '\b': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'b'; break;
-                case '\f': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'f'; break;
-                case '\n': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'n'; break;
-                case '\r': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 'r'; break;
-                case '\t': encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = 't'; break;
-                default: if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", utf8String[utf8Idx]))) { return(1); } break;
-              }
-            } else {
-              if(JK_EXPECT_F(utf8String[utf8Idx] >= 0x80U) && (encodeState->serializeOptionFlags & JKSerializeOptionEscapeUnicode)) {
-                const unsigned char *nextValidCharacter = NULL;
-                UTF32                u32ch              = 0U;
-                ConversionResult     result;
-
-                if(JK_EXPECT_F((result = ConvertSingleCodePointInUTF8(&utf8String[utf8Idx], &utf8String[usedBytes], (UTF8 const **)&nextValidCharacter, &u32ch)) != conversionOK)) { jk_encode_error(encodeState, @"Error converting UTF8."); return(1); }
-                else {
-                  utf8Idx = (nextValidCharacter - utf8String) - 1UL;
-                  if(JK_EXPECT_T(u32ch <= 0xffffU)) { if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", u32ch)))                                                           { return(1); } }
-                  else                              { if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x\\u%4.4x", (0xd7c0U + (u32ch >> 10)), (0xdc00U + (u32ch & 0x3ffU))))) { return(1); } }
+            if(object == (id)kCFBooleanTrue)  { return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "true",  4UL)); }
+            else if(object == (id)kCFBooleanFalse) { return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "false", 5UL)); }
+            
+            const char         *objCType = [object objCType];
+            char                anum[256], *aptr = &anum[255];
+            int                 isNegative = 0;
+            unsigned long long  ullv;
+            long long           llv;
+            
+            if(JK_EXPECT_F(objCType == NULL) || JK_EXPECT_F(objCType[0] == 0) || JK_EXPECT_F(objCType[1] != 0)) { jk_encode_error(encodeState, @"NSNumber conversion error, unknown type.  Type: '%s'", (objCType == NULL) ? "<NULL>" : objCType); return(1); }
+            
+            switch(objCType[0]) {
+                case 'c': case 'i': case 's': case 'l': case 'q':
+                    if(JK_EXPECT_T(CFNumberGetValue((CFNumberRef)object, kCFNumberLongLongType, &llv)))  {
+                        if(llv < 0LL)  { ullv = -llv; isNegative = 1; } else { ullv = llv; isNegative = 0; }
+                        goto convertNumber;
+                    } else { jk_encode_error(encodeState, @"Unable to get scalar value from number object."); return(1); }
+                    break;
+                case 'C': case 'I': case 'S': case 'L': case 'Q': case 'B':
+                    if(JK_EXPECT_T(CFNumberGetValue((CFNumberRef)object, kCFNumberLongLongType, &ullv))) {
+                    convertNumber:
+                        if(JK_EXPECT_F(ullv < 10ULL)) { *--aptr = ullv + '0'; } else { while(JK_EXPECT_T(ullv > 0ULL)) { *--aptr = (ullv % 10ULL) + '0'; ullv /= 10ULL; NSCParameterAssert(aptr > anum); } }
+                        if(isNegative) { *--aptr = '-'; }
+                        NSCParameterAssert(aptr > anum);
+                        return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, aptr, &anum[255] - aptr));
+                    } else { jk_encode_error(encodeState, @"Unable to get scalar value from number object."); return(1); }
+                    break;
+                case 'f': case 'd':
+                {
+                    double dv;
+                    if(JK_EXPECT_T(CFNumberGetValue((CFNumberRef)object, kCFNumberDoubleType, &dv))) {
+                        if(JK_EXPECT_F(!isfinite(dv))) { jk_encode_error(encodeState, @"Floating point values must be finite.  JSON does not support NaN or Infinity."); return(1); }
+                        return(jk_encode_printf(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "%.17g", dv));
+                    } else { jk_encode_error(encodeState, @"Unable to get floating point value from number object."); return(1); }
                 }
-              } else {
-                if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\') || (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
-                encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];
-              }
+                    break;
+                default: jk_encode_error(encodeState, @"NSNumber conversion error, unknown type.  Type: '%c' / 0x%2.2x", objCType[0], objCType[0]); return(1); break;
             }
-          }
-          NSCParameterAssert((encodeState->atIndex + 1UL) < encodeState->stringBuffer.bytes.length);
-          if(JK_EXPECT_T((encodeState->encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\"'; }
-          jk_encode_updateCache(encodeState, cacheSlot, startingAtIndex, encodeCacheObject);
-          return(0);
         }
-      }
-      break;
-
-    case JKClassNumber:
-      {
-             if(object == (id)kCFBooleanTrue)  { return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "true",  4UL)); }
-        else if(object == (id)kCFBooleanFalse) { return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "false", 5UL)); }
-        
-        const char         *objCType = [object objCType];
-        char                anum[256], *aptr = &anum[255];
-        int                 isNegative = 0;
-        unsigned long long  ullv;
-        long long           llv;
-        
-        if(JK_EXPECT_F(objCType == NULL) || JK_EXPECT_F(objCType[0] == 0) || JK_EXPECT_F(objCType[1] != 0)) { jk_encode_error(encodeState, @"NSNumber conversion error, unknown type.  Type: '%s'", (objCType == NULL) ? "<NULL>" : objCType); return(1); }
-        
-        switch(objCType[0]) {
-          case 'c': case 'i': case 's': case 'l': case 'q':
-            if(JK_EXPECT_T(CFNumberGetValue((CFNumberRef)object, kCFNumberLongLongType, &llv)))  {
-              if(llv < 0LL)  { ullv = -llv; isNegative = 1; } else { ullv = llv; isNegative = 0; }
-              goto convertNumber;
-            } else { jk_encode_error(encodeState, @"Unable to get scalar value from number object."); return(1); }
-            break;
-          case 'C': case 'I': case 'S': case 'L': case 'Q': case 'B':
-            if(JK_EXPECT_T(CFNumberGetValue((CFNumberRef)object, kCFNumberLongLongType, &ullv))) {
-            convertNumber:
-              if(JK_EXPECT_F(ullv < 10ULL)) { *--aptr = ullv + '0'; } else { while(JK_EXPECT_T(ullv > 0ULL)) { *--aptr = (ullv % 10ULL) + '0'; ullv /= 10ULL; NSCParameterAssert(aptr > anum); } }
-              if(isNegative) { *--aptr = '-'; }
-              NSCParameterAssert(aptr > anum);
-              return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, aptr, &anum[255] - aptr));
-            } else { jk_encode_error(encodeState, @"Unable to get scalar value from number object."); return(1); }
             break;
-          case 'f': case 'd':
-            {
-              double dv;
-              if(JK_EXPECT_T(CFNumberGetValue((CFNumberRef)object, kCFNumberDoubleType, &dv))) {
-                if(JK_EXPECT_F(!isfinite(dv))) { jk_encode_error(encodeState, @"Floating point values must be finite.  JSON does not support NaN or Infinity."); return(1); }
-                return(jk_encode_printf(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "%.17g", dv));
-              } else { jk_encode_error(encodeState, @"Unable to get floating point value from number object."); return(1); }
+            
+        case JKClassArray:
+        {
+            int     printComma = 0;
+            CFIndex arrayCount = CFArrayGetCount((CFArrayRef)object), idx = 0L;
+            if(JK_EXPECT_F(jk_encode_write1(encodeState, 1L, "["))) { return(1); }
+            if(JK_EXPECT_F(arrayCount > 1020L)) {
+                for(id arrayObject in object)          { if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } } printComma = 1; if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, arrayObject)))  { return(1); } }
+            } else {
+                void *objects[1024];
+                CFArrayGetValues((CFArrayRef)object, CFRangeMake(0L, arrayCount), (const void **)objects);
+                for(idx = 0L; idx < arrayCount; idx++) { if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } } printComma = 1; if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, objects[idx]))) { return(1); } }
             }
-            break;
-          default: jk_encode_error(encodeState, @"NSNumber conversion error, unknown type.  Type: '%c' / 0x%2.2x", objCType[0], objCType[0]); return(1); break;
-        }
-      }
-      break;
-    
-    case JKClassArray:
-      {
-        int     printComma = 0;
-        CFIndex arrayCount = CFArrayGetCount((CFArrayRef)object), idx = 0L;
-        if(JK_EXPECT_F(jk_encode_write1(encodeState, 1L, "["))) { return(1); }
-        if(JK_EXPECT_F(arrayCount > 1020L)) {
-          for(id arrayObject in object)          { if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } } printComma = 1; if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, arrayObject)))  { return(1); } }
-        } else {
-          void *objects[1024];
-          CFArrayGetValues((CFArrayRef)object, CFRangeMake(0L, arrayCount), (const void **)objects);
-          for(idx = 0L; idx < arrayCount; idx++) { if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } } printComma = 1; if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, objects[idx]))) { return(1); } }
+            return(jk_encode_write1(encodeState, -1L, "]"));
         }
-        return(jk_encode_write1(encodeState, -1L, "]"));
-      }
-      break;
-
-    case JKClassDictionary:
-      {
-        int     printComma      = 0;
-        CFIndex dictionaryCount = CFDictionaryGetCount((CFDictionaryRef)object), idx = 0L;
-        id      enumerateObject = JK_EXPECT_F(_jk_encode_prettyPrint) ? [[object allKeys] sortedArrayUsingSelector:@selector(compare:)] : object;
-
-        if(JK_EXPECT_F(jk_encode_write1(encodeState, 1L, "{"))) { return(1); }
-        if(JK_EXPECT_F(_jk_encode_prettyPrint) || JK_EXPECT_F(dictionaryCount > 1020L)) {
-          for(id keyObject in enumerateObject) {
-            if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } }
-            printComma = 1;
-            void *keyObjectISA = *((void **)keyObject);
-            if(JK_EXPECT_F((keyObjectISA != encodeState->fastClassLookup.stringClass)) && JK_EXPECT_F(([keyObject isKindOfClass:[NSString class]] == NO))) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
-            if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, keyObject)))                                                        { return(1); }
-            if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ":")))                                                                      { return(1); }
-            if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, (void *)CFDictionaryGetValue((CFDictionaryRef)object, keyObject)))) { return(1); }
-          }
-        } else {
-          void *keys[1024], *objects[1024];
-          CFDictionaryGetKeysAndValues((CFDictionaryRef)object, (const void **)keys, (const void **)objects);
-          for(idx = 0L; idx < dictionaryCount; idx++) {
-            if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } }
-            printComma = 1;
-            void *keyObjectISA = *((void **)keys[idx]);
-            if(JK_EXPECT_F(keyObjectISA != encodeState->fastClassLookup.stringClass) && JK_EXPECT_F([(id)keys[idx] isKindOfClass:[NSString class]] == NO)) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
-            if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, keys[idx])))    { return(1); }
-            if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ":")))                  { return(1); }
-            if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, objects[idx]))) { return(1); }
-          }
+            break;
+            
+        case JKClassDictionary:
+        {
+            int     printComma      = 0;
+            CFIndex dictionaryCount = CFDictionaryGetCount((CFDictionaryRef)object), idx = 0L;
+            id      enumerateObject = JK_EXPECT_F(_jk_encode_prettyPrint) ? [[object allKeys] sortedArrayUsingSelector:@selector(compare:)] : object;
+            
+            if(JK_EXPECT_F(jk_encode_write1(encodeState, 1L, "{"))) { return(1); }
+            if(JK_EXPECT_F(_jk_encode_prettyPrint) || JK_EXPECT_F(dictionaryCount > 1020L)) {
+                for(id keyObject in enumerateObject) {
+                    if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } }
+                    printComma = 1;
+                    void *keyObjectISA = *((void **)keyObject);
+                    if(JK_EXPECT_F((keyObjectISA != encodeState->fastClassLookup.stringClass)) && JK_EXPECT_F(([keyObject isKindOfClass:[NSString class]] == NO))) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
+                    if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, keyObject)))                                                        { return(1); }
+                    if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ":")))                                                                      { return(1); }
+                    if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, (void *)CFDictionaryGetValue((CFDictionaryRef)object, keyObject)))) { return(1); }
+                }
+            } else {
+                void *keys[1024], *objects[1024];
+                CFDictionaryGetKeysAndValues((CFDictionaryRef)object, (const void **)keys, (const void **)objects);
+                for(idx = 0L; idx < dictionaryCount; idx++) {
+                    if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } }
+                    printComma = 1;
+                    void *keyObjectISA = object_getClass(keys[idx]);
+                    if(JK_EXPECT_F(keyObjectISA != encodeState->fastClassLookup.stringClass) && JK_EXPECT_F([(id)keys[idx] isKindOfClass:[NSString class]] == NO)) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
+                    if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, keys[idx])))    { return(1); }
+                    if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ":")))                  { return(1); }
+                    if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, objects[idx]))) { return(1); }
+                }
+            }
+            return(jk_encode_write1(encodeState, -1L, "}"));
         }
-        return(jk_encode_write1(encodeState, -1L, "}"));
-      }
-      break;
-
-    case JKClassNull: return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "null", 4UL)); break;
-
-    default: jk_encode_error(encodeState, @"Unable to serialize object class %@.", NSStringFromClass([object class])); return(1); break;
-  }
-
-  return(0);
+            break;
+            
+        case JKClassNull: return(jk_encode_writen(encodeState, cacheSlot, startingAtIndex, encodeCacheObject, "null", 4UL)); break;
+            
+        default: jk_encode_error(encodeState, @"Unable to serialize object class %@.", NSStringFromClass([object class])); return(1); break;
+    }
+    
+    return(0);
 }
 
 
@@ -2828,7 +2828,7 @@ @implementation JKSerializer
 
 + (id)serializeObject:(id)object options:(JKSerializeOptionFlags)optionFlags encodeOption:(JKEncodeOptionType)encodeOption block:(JKSERIALIZER_BLOCKS_PROTO)block delegate:(id)delegate selector:(SEL)selector error:(NSError **)error
 {
-  return([[[[self alloc] init] autorelease] serializeObject:object options:optionFlags encodeOption:encodeOption block:block delegate:delegate selector:selector error:error]);
+    return([[[[self alloc] init] autorelease] serializeObject:object options:optionFlags encodeOption:encodeOption block:block delegate:delegate selector:selector error:error]);
 }
 
 - (id)serializeObject:(id)object options:(JKSerializeOptionFlags)optionFlags encodeOption:(JKEncodeOptionType)encodeOption block:(JKSERIALIZER_BLOCKS_PROTO)block delegate:(id)delegate selector:(SEL)selector error:(NSError **)error
@@ -2836,86 +2836,86 @@ - (id)serializeObject:(id)object options:(JKSerializeOptionFlags)optionFlags enc
 #ifndef __BLOCKS__
 #pragma unused(block)
 #endif
-  NSParameterAssert((object != NULL) && (encodeState == NULL) && ((delegate != NULL) ? (block == NULL) : 1) && ((block != NULL) ? (delegate == NULL) : 1) &&
-                    (((encodeOption & JKEncodeOptionCollectionObj) != 0UL) ? (((encodeOption & JKEncodeOptionStringObj)     == 0UL) && ((encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) : 1) &&
-                    (((encodeOption & JKEncodeOptionStringObj)     != 0UL) ?  ((encodeOption & JKEncodeOptionCollectionObj) == 0UL)                                                                 : 1));
-
-  id returnObject = NULL;
-
-  if(encodeState != NULL) { [self releaseState]; }
-  if((encodeState = (struct JKEncodeState *)calloc(1UL, sizeof(JKEncodeState))) == NULL) { [NSException raise:NSMallocException format:@"Unable to allocate state structure."]; return(NULL); }
-
-  if((error != NULL) && (*error != NULL)) { *error = NULL; }
-
-  if(delegate != NULL) {
-    if(selector                               == NULL) { [NSException raise:NSInvalidArgumentException format:@"The delegate argument is not NULL, but the selector argument is NULL."]; }
-    if([delegate respondsToSelector:selector] == NO)   { [NSException raise:NSInvalidArgumentException format:@"The serializeUnsupportedClassesUsingDelegate: delegate does not respond to the selector argument."]; }
-    encodeState->classFormatterDelegate = delegate;
-    encodeState->classFormatterSelector = selector;
-    encodeState->classFormatterIMP      = (JKClassFormatterIMP)[delegate methodForSelector:selector];
-    NSCParameterAssert(encodeState->classFormatterIMP != NULL);
-  }
-
+    NSParameterAssert((object != NULL) && (encodeState == NULL) && ((delegate != NULL) ? (block == NULL) : 1) && ((block != NULL) ? (delegate == NULL) : 1) &&
+                      (((encodeOption & JKEncodeOptionCollectionObj) != 0UL) ? (((encodeOption & JKEncodeOptionStringObj)     == 0UL) && ((encodeOption & JKEncodeOptionStringObjTrimQuotes) == 0UL)) : 1) &&
+                      (((encodeOption & JKEncodeOptionStringObj)     != 0UL) ?  ((encodeOption & JKEncodeOptionCollectionObj) == 0UL)                                                                 : 1));
+    
+    id returnObject = NULL;
+    
+    if(encodeState != NULL) { [self releaseState]; }
+    if((encodeState = (struct JKEncodeState *)calloc(1UL, sizeof(JKEncodeState))) == NULL) { [NSException raise:NSMallocException format:@"Unable to allocate state structure."]; return(NULL); }
+    
+    if((error != NULL) && (*error != NULL)) { *error = NULL; }
+    
+    if(delegate != NULL) {
+        if(selector                               == NULL) { [NSException raise:NSInvalidArgumentException format:@"The delegate argument is not NULL, but the selector argument is NULL."]; }
+        if([delegate respondsToSelector:selector] == NO)   { [NSException raise:NSInvalidArgumentException format:@"The serializeUnsupportedClassesUsingDelegate: delegate does not respond to the selector argument."]; }
+        encodeState->classFormatterDelegate = delegate;
+        encodeState->classFormatterSelector = selector;
+        encodeState->classFormatterIMP      = (JKClassFormatterIMP)[delegate methodForSelector:selector];
+        NSCParameterAssert(encodeState->classFormatterIMP != NULL);
+    }
+    
 #ifdef __BLOCKS__
-  encodeState->classFormatterBlock                          = block;
+    encodeState->classFormatterBlock                          = block;
 #endif
-  encodeState->serializeOptionFlags                         = optionFlags;
-  encodeState->encodeOption                                 = encodeOption;
-  encodeState->stringBuffer.roundSizeUpToMultipleOf         = (1024UL * 32UL);
-  encodeState->utf8ConversionBuffer.roundSizeUpToMultipleOf = 4096UL;
+    encodeState->serializeOptionFlags                         = optionFlags;
+    encodeState->encodeOption                                 = encodeOption;
+    encodeState->stringBuffer.roundSizeUpToMultipleOf         = (1024UL * 32UL);
+    encodeState->utf8ConversionBuffer.roundSizeUpToMultipleOf = 4096UL;
     
-  unsigned char stackJSONBuffer[JK_JSONBUFFER_SIZE] JK_ALIGNED(64);
-  jk_managedBuffer_setToStackBuffer(&encodeState->stringBuffer,         stackJSONBuffer, sizeof(stackJSONBuffer));
-
-  unsigned char stackUTF8Buffer[JK_UTF8BUFFER_SIZE] JK_ALIGNED(64);
-  jk_managedBuffer_setToStackBuffer(&encodeState->utf8ConversionBuffer, stackUTF8Buffer, sizeof(stackUTF8Buffer));
-
-  if(((encodeOption & JKEncodeOptionCollectionObj) != 0UL) && (([object isKindOfClass:[NSArray  class]] == NO) && ([object isKindOfClass:[NSDictionary class]] == NO))) { jk_encode_error(encodeState, @"Unable to serialize object class %@, expected a NSArray or NSDictionary.", NSStringFromClass([object class])); goto errorExit; }
-  if(((encodeOption & JKEncodeOptionStringObj)     != 0UL) &&  ([object isKindOfClass:[NSString class]] == NO))                                                         { jk_encode_error(encodeState, @"Unable to serialize object class %@, expected a NSString.", NSStringFromClass([object class])); goto errorExit; }
-
-  if(jk_encode_add_atom_to_buffer(encodeState, object) == 0) {
-    BOOL stackBuffer = ((encodeState->stringBuffer.flags & JKManagedBufferMustFree) == 0UL) ? YES : NO;
+    unsigned char stackJSONBuffer[JK_JSONBUFFER_SIZE] JK_ALIGNED(64);
+    jk_managedBuffer_setToStackBuffer(&encodeState->stringBuffer,         stackJSONBuffer, sizeof(stackJSONBuffer));
     
-    if((encodeState->atIndex < 2UL))
-    if((stackBuffer == NO) && ((encodeState->stringBuffer.bytes.ptr = (unsigned char *)reallocf(encodeState->stringBuffer.bytes.ptr, encodeState->atIndex + 16UL)) == NULL)) { jk_encode_error(encodeState, @"Unable to realloc buffer"); goto errorExit; }
-
-    switch((encodeOption & JKEncodeOptionAsTypeMask)) {
-      case JKEncodeOptionAsData:
-        if(stackBuffer == YES) { if((returnObject = [(id)CFDataCreate(                 NULL,                encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex)                                  autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSData object"); } }
-        else                   { if((returnObject = [(id)CFDataCreateWithBytesNoCopy(  NULL,                encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex, NULL)                            autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSData object"); } }
-        break;
-
-      case JKEncodeOptionAsString:
-        if(stackBuffer == YES) { if((returnObject = [(id)CFStringCreateWithBytes(      NULL, (const UInt8 *)encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex, kCFStringEncodingUTF8, NO)       autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSString object"); } }
-        else                   { if((returnObject = [(id)CFStringCreateWithBytesNoCopy(NULL, (const UInt8 *)encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex, kCFStringEncodingUTF8, NO, NULL) autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSString object"); } }
-        break;
-
-      default: jk_encode_error(encodeState, @"Unknown encode as type."); break;
+    unsigned char stackUTF8Buffer[JK_UTF8BUFFER_SIZE] JK_ALIGNED(64);
+    jk_managedBuffer_setToStackBuffer(&encodeState->utf8ConversionBuffer, stackUTF8Buffer, sizeof(stackUTF8Buffer));
+    
+    if(((encodeOption & JKEncodeOptionCollectionObj) != 0UL) && (([object isKindOfClass:[NSArray  class]] == NO) && ([object isKindOfClass:[NSDictionary class]] == NO))) { jk_encode_error(encodeState, @"Unable to serialize object class %@, expected a NSArray or NSDictionary.", NSStringFromClass([object class])); goto errorExit; }
+    if(((encodeOption & JKEncodeOptionStringObj)     != 0UL) &&  ([object isKindOfClass:[NSString class]] == NO))                                                         { jk_encode_error(encodeState, @"Unable to serialize object class %@, expected a NSString.", NSStringFromClass([object class])); goto errorExit; }
+    
+    if(jk_encode_add_atom_to_buffer(encodeState, object) == 0) {
+        BOOL stackBuffer = ((encodeState->stringBuffer.flags & JKManagedBufferMustFree) == 0UL) ? YES : NO;
+        
+        if((encodeState->atIndex < 2UL))
+            if((stackBuffer == NO) && ((encodeState->stringBuffer.bytes.ptr = (unsigned char *)reallocf(encodeState->stringBuffer.bytes.ptr, encodeState->atIndex + 16UL)) == NULL)) { jk_encode_error(encodeState, @"Unable to realloc buffer"); goto errorExit; }
+        
+        switch((encodeOption & JKEncodeOptionAsTypeMask)) {
+            case JKEncodeOptionAsData:
+                if(stackBuffer == YES) { if((returnObject = [(id)CFDataCreate(                 NULL,                encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex)                                  autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSData object"); } }
+                else                   { if((returnObject = [(id)CFDataCreateWithBytesNoCopy(  NULL,                encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex, NULL)                            autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSData object"); } }
+                break;
+                
+            case JKEncodeOptionAsString:
+                if(stackBuffer == YES) { if((returnObject = [(id)CFStringCreateWithBytes(      NULL, (const UInt8 *)encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex, kCFStringEncodingUTF8, NO)       autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSString object"); } }
+                else                   { if((returnObject = [(id)CFStringCreateWithBytesNoCopy(NULL, (const UInt8 *)encodeState->stringBuffer.bytes.ptr, (CFIndex)encodeState->atIndex, kCFStringEncodingUTF8, NO, NULL) autorelease]) == NULL) { jk_encode_error(encodeState, @"Unable to create NSString object"); } }
+                break;
+                
+            default: jk_encode_error(encodeState, @"Unknown encode as type."); break;
+        }
+        
+        if((returnObject != NULL) && (stackBuffer == NO)) { encodeState->stringBuffer.flags &= ~JKManagedBufferMustFree; encodeState->stringBuffer.bytes.ptr = NULL; encodeState->stringBuffer.bytes.length = 0UL; }
     }
-
-    if((returnObject != NULL) && (stackBuffer == NO)) { encodeState->stringBuffer.flags &= ~JKManagedBufferMustFree; encodeState->stringBuffer.bytes.ptr = NULL; encodeState->stringBuffer.bytes.length = 0UL; }
-  }
-
+    
 errorExit:
-  if((encodeState != NULL) && (error != NULL) && (encodeState->error != NULL)) { *error = encodeState->error; encodeState->error = NULL; }
-  [self releaseState];
-
-  return(returnObject);
+    if((encodeState != NULL) && (error != NULL) && (encodeState->error != NULL)) { *error = encodeState->error; encodeState->error = NULL; }
+    [self releaseState];
+    
+    return(returnObject);
 }
 
 - (void)releaseState
 {
-  if(encodeState != NULL) {
-    jk_managedBuffer_release(&encodeState->stringBuffer);
-    jk_managedBuffer_release(&encodeState->utf8ConversionBuffer);
-    free(encodeState); encodeState = NULL;
-  }  
+    if(encodeState != NULL) {
+        jk_managedBuffer_release(&encodeState->stringBuffer);
+        jk_managedBuffer_release(&encodeState->utf8ConversionBuffer);
+        free(encodeState); encodeState = NULL;
+    }
 }
 
 - (void)dealloc
 {
-  [self releaseState];
-  [super dealloc];
+    [self releaseState];
+    [super dealloc];
 }
 
 @end
@@ -2932,24 +2932,24 @@ @implementation NSString (JSONKitSerializing)
 
 - (NSData *)JSONData
 {
-  return([self JSONDataWithOptions:JKSerializeOptionNone includeQuotes:YES error:NULL]);
+    return([self JSONDataWithOptions:JKSerializeOptionNone includeQuotes:YES error:NULL]);
 }
 
 - (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | ((includeQuotes == NO) ? JKEncodeOptionStringObjTrimQuotes : 0UL) | JKEncodeOptionStringObj) block:NULL delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | ((includeQuotes == NO) ? JKEncodeOptionStringObjTrimQuotes : 0UL) | JKEncodeOptionStringObj) block:NULL delegate:NULL selector:NULL error:error]);
 }
 
 // NSString returning methods...
 
 - (NSString *)JSONString
 {
-  return([self JSONStringWithOptions:JKSerializeOptionNone includeQuotes:YES error:NULL]);
+    return([self JSONStringWithOptions:JKSerializeOptionNone includeQuotes:YES error:NULL]);
 }
 
 - (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | ((includeQuotes == NO) ? JKEncodeOptionStringObjTrimQuotes : 0UL) | JKEncodeOptionStringObj) block:NULL delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | ((includeQuotes == NO) ? JKEncodeOptionStringObjTrimQuotes : 0UL) | JKEncodeOptionStringObj) block:NULL delegate:NULL selector:NULL error:error]);
 }
 
 @end
@@ -2960,34 +2960,34 @@ @implementation NSArray (JSONKitSerializing)
 
 - (NSData *)JSONData
 {
-  return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
+    return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
 }
 
 - (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
 }
 
 - (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
 }
 
 // NSString returning methods...
 
 - (NSString *)JSONString
 {
-  return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
+    return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
 }
 
 - (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
 }
 
 - (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
 }
 
 @end
@@ -2998,34 +2998,34 @@ @implementation NSDictionary (JSONKitSerializing)
 
 - (NSData *)JSONData
 {
-  return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
+    return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
 }
 
 - (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
 }
 
 - (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
 }
 
 // NSString returning methods...
 
 - (NSString *)JSONString
 {
-  return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
+    return([JKSerializer serializeObject:self options:JKSerializeOptionNone encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:NULL]);
 }
 
 - (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:NULL selector:NULL error:error]);
 }
 
 - (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:NULL delegate:delegate selector:selector error:error]);
 }
 
 @end
@@ -3037,12 +3037,12 @@ @implementation NSArray (JSONKitSerializingBlockAdditions)
 
 - (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
 }
 
 - (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
 }
 
 @end
@@ -3051,15 +3051,14 @@ @implementation NSDictionary (JSONKitSerializingBlockAdditions)
 
 - (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsData | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
 }
 
 - (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error
 {
-  return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
+    return([JKSerializer serializeObject:self options:serializeOptions encodeOption:(JKEncodeOptionAsString | JKEncodeOptionCollectionObj) block:block delegate:NULL selector:NULL error:error]);
 }
 
 @end
 
 #endif // __BLOCKS__
-