diff --git a/Source/NSCTemplateValue.m b/Source/NSCTemplateValue.m
index d6fbd05e7..09a4bdaa0 100644
--- a/Source/NSCTemplateValue.m
+++ b/Source/NSCTemplateValue.m
@@ -89,13 +89,13 @@
 // NSCoding
 - (void)encodeWithCoder:(NSCoder *)coder
 {
-//FIXME    [super encodeWithCoder:coder];
+    [super encodeWithCoder:coder];
     [coder encodeValueOfObjCType:[self objCType] at:&data];
 }
 
 - (id)initWithCoder:(NSCoder *)coder
 {
-//FIXME    self = [super initWithCoder:coder];
+    self = [super initWithCoder:coder];
     [coder decodeValueOfObjCType:[self objCType] at:&data];
     return self;
 }
diff --git a/Source/NSConcreteNumber.m b/Source/NSConcreteNumber.m
index eed479bf6..de3b0990e 100644
--- a/Source/NSConcreteNumber.m
+++ b/Source/NSConcreteNumber.m
@@ -194,13 +194,13 @@
 // NSCoding
 - (void)encodeWithCoder:(NSCoder *)coder
 {
-//FIXME    [super encodeWithCoder:coder];
+    [super encodeWithCoder:coder];
     [coder encodeValueOfObjCType:[self objCType] at:&data];
 }
 
 - (id)initWithCoder:(NSCoder *)coder
 {
-//FIXME    self = [super initWithCoder:coder];
+    self = [super initWithCoder:coder];
     [coder decodeValueOfObjCType:[self objCType] at:&data];
     return self;
 }
diff --git a/Source/NSConcreteValue.m b/Source/NSConcreteValue.m
index 89e45d5ec..e767dd71e 100644
--- a/Source/NSConcreteValue.m
+++ b/Source/NSConcreteValue.m
@@ -141,8 +141,7 @@
 // NSCoding
 - (void)encodeWithCoder:(NSCoder *)coder
 {
-    
-//FIXME    [super encodeWithCoder:coder];
+    [super encodeWithCoder:coder];
     // FIXME: Do we need to check for encoding void, void * or will
     // NSCoder do this for us?
     [coder encodeObject:objctype];
@@ -151,7 +150,7 @@
 
 - (id)initWithCoder:(NSCoder *)coder
 {
-//FIXME    self = [super initWithCoder:coder];
+    self = [super initWithCoder:coder];
     objctype = [[coder decodeObject] retain];
     [coder decodeValueOfObjCType:[objctype cString] at:&data];
     return self;
diff --git a/Source/NSException.m b/Source/NSException.m
index be94c6eae..fe1ad08ca 100644
--- a/Source/NSException.m
+++ b/Source/NSException.m
@@ -139,7 +139,7 @@ _NSFoundationUncaughtExceptionHandler(NSException *exception)
 
 - (void)encodeWithCoder:(NSCoder *)aCoder
 {
-//FIXME    [super encodeWithCoder:aCoder];
+    [super encodeWithCoder:aCoder];
     [aCoder encodeObject:e_name]; 
     [aCoder encodeObject:e_reason]; 
     [aCoder encodeObject:e_info]; 
@@ -147,7 +147,7 @@ _NSFoundationUncaughtExceptionHandler(NSException *exception)
 
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
-//FIXME    self = [super initWithCoder:aDecoder];
+    self = [super initWithCoder:aDecoder];
     e_name = [[aDecoder decodeObject] retain]; 
     e_reason = [[aDecoder decodeObject] retain]; 
     e_info = [[aDecoder decodeObject] retain]; 
diff --git a/Source/NSNumber.m b/Source/NSNumber.m
index b12379292..1b9bbf2bb 100644
--- a/Source/NSNumber.m
+++ b/Source/NSNumber.m
@@ -252,12 +252,12 @@
 
 - (void)encodeWithCoder:(NSCoder *)coder
 {
-//FIXME    [super encodeWithCoder:coder];
+    [super encodeWithCoder:coder];
 }
 
 - (id)initWithCoder:(NSCoder *)coder
 {
-//FIXME    self =  [super initWithCoder:coder];
+    self =  [super initWithCoder:coder];
     return self;
 }
 
diff --git a/Source/NSValue.m b/Source/NSValue.m
index 33a1e6a9c..a81b591eb 100644
--- a/Source/NSValue.m
+++ b/Source/NSValue.m
@@ -159,12 +159,12 @@
 
 - (void)encodeWithCoder:(NSCoder *)coder
 {
-//FIXME    [super encodeWithCoder:coder];
+    [super encodeWithCoder:coder];
 }
 
 - (id)initWithCoder:(NSCoder *)coder
 {
-//FIXME    self = [super initWithCoder:coder];
+    self = [super initWithCoder:coder];
     return self;
 }