diff --git a/misc/xcode4-templates/Mac/Application/MacRuby Core Data Application.xctemplate/TemplateInfo.plist b/misc/xcode4-templates/Mac/Application/MacRuby Core Data Application.xctemplate/TemplateInfo.plist
index e6f85fa37..c0e628ece 100755
--- a/misc/xcode4-templates/Mac/Application/MacRuby Core Data Application.xctemplate/TemplateInfo.plist	
+++ b/misc/xcode4-templates/Mac/Application/MacRuby Core Data Application.xctemplate/TemplateInfo.plist	
@@ -181,12 +181,10 @@ end
 # Returns the persistent store coordinator for the application. This implementation creates and return a coordinator, having added the store for the application to it. (The directory for the store is created, if necessary.)
 #
 def persistentStoreCoordinator
-    if !@persistentStoreCoordinator.nil?
-        return @persistentStoreCoordinator
-    end
+    return @persistentStoreCoordinator unless @persistentStoreCoordinator.nil?
 
     mom = self.managedObjectModel
-    if !mom.nil?
+    if mom.nil?
         puts "#{self.class} No model to generate a store from"
         return nil
     end
@@ -205,8 +203,7 @@ def persistentStoreCoordinator
         if ok == false
             NSApplication.sharedApplication.presentError(error[0])
         end
-    else
-        if properties[NSURLIsDirectoryKey] != true
+    elsif properties[NSURLIsDirectoryKey] != true
             # Customize and localize this error.
             failure_description = "Expected a folder to store application data, found a file (#{directory.path})."
 
@@ -233,9 +230,7 @@ end
 # bound to the persistent store coordinator for the application.) 
 #
 def managedObjectContext
-    if !@managedObjectContext.nil?
-        return @managedObjectContext
-    end
+    return @managedObjectContext unless @managedObjectContext.nil?
 
     coordinator = self.persistentStoreCoordinator
 
@@ -280,9 +275,7 @@ end
 def applicationShouldTerminate(sender)
     # Save changes in the application's managed object context before the application terminates.
 
-    if @managedObjectContext.nil?
-        return NSTerminateNow
-    end
+    return NSTerminateNow if @managedObjectContext.nil?
 
     unless self.managedObjectContext.commitEditing
         puts "%@ unable to commit editing to terminate" % self.class
diff --git a/misc/xcode4-templates/Mac/Application/MacRuby Document-based Application.xctemplate/TemplateInfo.plist b/misc/xcode4-templates/Mac/Application/MacRuby Document-based Application.xctemplate/TemplateInfo.plist
index c1b2f815a..b60529448 100644
--- a/misc/xcode4-templates/Mac/Application/MacRuby Document-based Application.xctemplate/TemplateInfo.plist	
+++ b/misc/xcode4-templates/Mac/Application/MacRuby Document-based Application.xctemplate/TemplateInfo.plist	
@@ -74,7 +74,7 @@
 						<key>___VARIABLE_documentClassName:identifier___.rb:implementation</key>
 						<dict>
 							<key>Beginning</key>
-							<string>class ___VARIABLE_documentClassName:identifier___</string>
+							<string>class ___VARIABLE_documentClassName:identifier___ &lt; NSDocument</string>
 							<key>End</key>
 							<string>end