diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m
index 261ad04a5..a5837caf2 100644
--- a/Source/NSPathUtilities.m
+++ b/Source/NSPathUtilities.m
@@ -359,147 +359,149 @@ GSOnceFLog(@"Use of '~' in GNUSTEP_USER_ROOT is deprecated");
 /* Initialise all things required by this module */
 static void InitialisePathUtilities(void)
 {
-  if (gnustepSystemRoot == nil)
-    {
-      NSDictionary  *env;
+  NSDictionary  *env;
 
-      /* Set up our root paths */
-      NS_DURING
-	{
+  if (gnustepSystemRoot != nil)
+    {
+      return;	// Protect from multiple calls
+    }
+
+  /* Set up our root paths */
+  NS_DURING
+    {
 #if defined(__WIN32__)
-	  HKEY regkey;
+      HKEY regkey;
 #endif
 
-	  /* Initialise Win32 things if on that platform */
-	  Win32Initialise();   // should be called by DLL_PROCESS_ATTACH
+      /* Initialise Win32 things if on that platform */
+      Win32Initialise();   // should be called by DLL_PROCESS_ATTACH
 
-	  [gnustep_global_lock lock];
+      [gnustep_global_lock lock];
 
 #ifndef OPTION_NO_ENVIRONMENT
-	  /* First we look at the environment */
-	  env = [[NSProcessInfo processInfo] environment];
+      /* First we look at the environment */
+      env = [[NSProcessInfo processInfo] environment];
 
-	  TEST_ASSIGN(gnustepSystemRoot , [env objectForKey: SYSTEM_ROOT]);
-	  TEST_ASSIGN(gnustepNetworkRoot, [env objectForKey: NETWORK_ROOT]);
-	  TEST_ASSIGN(gnustepLocalRoot  , [env objectForKey: LOCAL_ROOT]);
+      TEST_ASSIGN(gnustepSystemRoot , [env objectForKey: SYSTEM_ROOT]);
+      TEST_ASSIGN(gnustepNetworkRoot, [env objectForKey: NETWORK_ROOT]);
+      TEST_ASSIGN(gnustepLocalRoot  , [env objectForKey: LOCAL_ROOT]);
 #endif /* !OPTION_NO_ENVIRONMENT */
 #if defined(__WIN32__)
-	  regkey = Win32OpenRegistry(HKEY_LOCAL_MACHINE,
-				     "\\Software\\GNU\\GNUstep");
-	  if (regkey != (HKEY)NULL)
-	    {
-	      TEST_ASSIGN(gnustepSystemRoot,
-			  Win32NSStringFromRegistry(regkey, SYSTEM_ROOT));
-	      TEST_ASSIGN(gnustepNetworkRoot,
-			  Win32NSStringFromRegistry(regkey, NETWORK_ROOT));
-	      TEST_ASSIGN(gnustepLocalRoot,
-			  Win32NSStringFromRegistry(regkey, LOCAL_ROOT));
-	      RegCloseKey(regkey);
-	    }
+      regkey = Win32OpenRegistry(HKEY_LOCAL_MACHINE,
+				 "\\Software\\GNU\\GNUstep");
+      if (regkey != (HKEY)NULL)
+	{
+	  TEST_ASSIGN(gnustepSystemRoot,
+		      Win32NSStringFromRegistry(regkey, SYSTEM_ROOT));
+	  TEST_ASSIGN(gnustepNetworkRoot,
+		      Win32NSStringFromRegistry(regkey, NETWORK_ROOT));
+	  TEST_ASSIGN(gnustepLocalRoot,
+		      Win32NSStringFromRegistry(regkey, LOCAL_ROOT));
+	  RegCloseKey(regkey);
+	}
 
 #if 0
-	  // Not implemented yet
-	  platformApps   = Win32FindDirectory(CLSID_APPS);
-	  platformLibs   = Win32FindDirectory(CLSID_LIBS);
+      // Not implemented yet
+      platformApps   = Win32FindDirectory(CLSID_APPS);
+      platformLibs   = Win32FindDirectory(CLSID_LIBS);
 #endif
 #else
-	  /* Now we source the configuration file if it exists */
-	  configFile
-	    = [NSString stringWithCString: stringify(GNUSTEP_CONFIGURATION_FILE)];
-	  configFile = RETAIN([configFile stringByStandardizingPath]);
-	  if ([MGR() fileExistsAtPath: configFile])
+      /* Now we source the configuration file if it exists */
+      configFile
+	= [NSString stringWithCString: stringify(GNUSTEP_CONFIGURATION_FILE)];
+      configFile = RETAIN([configFile stringByStandardizingPath]);
+      if ([MGR() fileExistsAtPath: configFile])
+	{
+	  NSDictionary  *d = GSReadStepConfFile(configFile);
+
+	  if (d != nil)
 	    {
-	      NSDictionary  *d = GSReadStepConfFile(configFile);
+	      TEST_ASSIGN(gnustepSystemRoot , [d objectForKey: SYSTEM_ROOT]);
+	      TEST_ASSIGN(gnustepNetworkRoot, [d objectForKey: NETWORK_ROOT]);
+	      TEST_ASSIGN(gnustepLocalRoot  , [d objectForKey: LOCAL_ROOT]);
 
-	      if (d != nil)
-		{
-		  TEST_ASSIGN(gnustepSystemRoot , [d objectForKey: SYSTEM_ROOT]);
-		  TEST_ASSIGN(gnustepNetworkRoot, [d objectForKey: NETWORK_ROOT]);
-		  TEST_ASSIGN(gnustepLocalRoot  , [d objectForKey: LOCAL_ROOT]);
-
-		  gnustepRcFileName = [d objectForKey: @"USER_GNUSTEP_RC"];
-		  gnustepDefaultsPath = [d objectForKey: @"USER_GNUSTEP_DEFAULTS"];
-		  gnustepUserPath = [d objectForKey: @"USER_GNUSTEP_DIR"];
+	      gnustepRcFileName = [d objectForKey: @"USER_GNUSTEP_RC"];
+	      gnustepDefaultsPath = [d objectForKey: @"USER_GNUSTEP_DEFAULTS"];
+	      gnustepUserPath = [d objectForKey: @"USER_GNUSTEP_DIR"];
 
 #ifdef OPTION_PLATFORM_SUPPORT
-		  osSysPrefs = getPathConfig(d, SYS_PREFS);
-		  osSysApps  = getPathConfig(d, SYS_APPS);
-		  osSysLibs  = getPathConfig(d, SYS_LIBS);
-		  osSysAdmin = getPathConfig(d, SYS_ADMIN);
+	      osSysPrefs = getPathConfig(d, SYS_PREFS);
+	      osSysApps  = getPathConfig(d, SYS_APPS);
+	      osSysLibs  = getPathConfig(d, SYS_LIBS);
+	      osSysAdmin = getPathConfig(d, SYS_ADMIN);
 
-		  platformResources = getPathConfig(d, PLATFORM_RESOURCES);
-		  platformApps      = getPathConfig(d, PLATFORM_APPS);
-		  platformLibs      = getPathConfig(d, PLATFORM_LIBS);
-		  platformAdmin     = getPathConfig(d, PLATFORM_ADMIN);
+	      platformResources = getPathConfig(d, PLATFORM_RESOURCES);
+	      platformApps      = getPathConfig(d, PLATFORM_APPS);
+	      platformLibs      = getPathConfig(d, PLATFORM_LIBS);
+	      platformAdmin     = getPathConfig(d, PLATFORM_ADMIN);
 
-		  localResources = getPathConfig(d, PLATFORM_LOCAL_RESOURCES);
-		  localApps      = getPathConfig(d, PLATFORM_LOCAL_APPS);
-		  localLibs      = getPathConfig(d, PLATFORM_LOCAL_LIBS);
+	      localResources = getPathConfig(d, PLATFORM_LOCAL_RESOURCES);
+	      localApps      = getPathConfig(d, PLATFORM_LOCAL_APPS);
+	      localLibs      = getPathConfig(d, PLATFORM_LOCAL_LIBS);
 #endif /* OPTION_PLATFORM SUPPORT */
-		}
 	    }
+	}
 #endif
 
-	  /* System admins may force the user and defaults paths by
-	   * setting USER_GNUSTEP_RC to be an empty string.
-	   * If they simply don't define it at all, we assign a default
-	   * value here.
-	   */
-	  TEST_ASSIGN(gnustepRcFileName,  DEFAULT_STEPRC_FILE);
+      /* System admins may force the user and defaults paths by
+       * setting USER_GNUSTEP_RC to be an empty string.
+       * If they simply don't define it at all, we assign a default
+       * value here.
+       */
+      TEST_ASSIGN(gnustepRcFileName,  DEFAULT_STEPRC_FILE);
 
-	  /* If the user has an rc file we need to source it */
-	  gnustepUserRoot = setUserGNUstepPath(NSUserName(),
-	    &gnustepDefaultsPath, &gnustepUserPath);
+      /* If the user has an rc file we need to source it */
+      gnustepUserRoot = setUserGNUstepPath(NSUserName(),
+	&gnustepDefaultsPath, &gnustepUserPath);
 
-	  /* Make sure that they're in path internal format */
-	  internalizePath(gnustepSystemRoot);
-	  internalizePath(gnustepNetworkRoot);
-	  internalizePath(gnustepLocalRoot);
-	  internalizePath(gnustepUserRoot);
+      /* Make sure that they're in path internal format */
+      internalizePath(gnustepSystemRoot);
+      internalizePath(gnustepNetworkRoot);
+      internalizePath(gnustepLocalRoot);
+      internalizePath(gnustepUserRoot);
 
-	  /* Finally we check and report problems... */
-	  if (gnustepSystemRoot == nil)
-	    {
-	      gnustepSystemRoot = internalizePathCString(\
-		STRINGIFY(GNUSTEP_INSTALL_PREFIX));
-	      fprintf (stderr, "Warning - GNUSTEP_SYSTEM_ROOT is not set " \
-		"- using %s\n", [gnustepSystemRoot lossyCString]);
-	    }
-	  if (gnustepNetworkRoot == nil)
-	    {
-	      gnustepNetworkRoot = internalizePathCString(\
-		STRINGIFY(GNUSTEP_NETWORK_ROOT));
-	      fprintf (stderr, "Warning - GNUSTEP_NETWORK_ROOT is not set " \
-		"- using %s\n", [gnustepNetworkRoot lossyCString]);
-	    }
-	  if (gnustepLocalRoot == nil)
-	    {
-	      gnustepLocalRoot = internalizePathCString(\
-		STRINGIFY(GNUSTEP_LOCAL_ROOT));
-	      fprintf (stderr, "Warning - GNUSTEP_LOCAL_ROOT is not set " \
-		"- using %s\n", [gnustepLocalRoot lossyCString]);
-	    }
-
-	  /* We're keeping these strings... */
-	  TEST_RETAIN(gnustepSystemRoot);
-	  TEST_RETAIN(gnustepNetworkRoot);
-	  TEST_RETAIN(gnustepLocalRoot);
-	  TEST_RETAIN(gnustepUserRoot);
-
-	  TEST_RETAIN(gnustepRcFileName);
-	  TEST_RETAIN(gnustepDefaultsPath);
-	  TEST_RETAIN(gnustepUserPath);
-
-	  [gnustep_global_lock unlock];
-	}
-      NS_HANDLER
+      /* Finally we check and report problems... */
+      if (gnustepSystemRoot == nil)
 	{
-	  /* unlock then re-raise the exception */
-	  [gnustep_global_lock unlock];
-	  [localException raise];
+	  gnustepSystemRoot = internalizePathCString(\
+	    STRINGIFY(GNUSTEP_INSTALL_PREFIX));
+	  fprintf (stderr, "Warning - GNUSTEP_SYSTEM_ROOT is not set " \
+	    "- using %s\n", [gnustepSystemRoot lossyCString]);
 	}
-      NS_ENDHANDLER
+      if (gnustepNetworkRoot == nil)
+	{
+	  gnustepNetworkRoot = internalizePathCString(\
+	    STRINGIFY(GNUSTEP_NETWORK_ROOT));
+	  fprintf (stderr, "Warning - GNUSTEP_NETWORK_ROOT is not set " \
+	    "- using %s\n", [gnustepNetworkRoot lossyCString]);
+	}
+      if (gnustepLocalRoot == nil)
+	{
+	  gnustepLocalRoot = internalizePathCString(\
+	    STRINGIFY(GNUSTEP_LOCAL_ROOT));
+	  fprintf (stderr, "Warning - GNUSTEP_LOCAL_ROOT is not set " \
+	    "- using %s\n", [gnustepLocalRoot lossyCString]);
+	}
+
+      /* We're keeping these strings... */
+      TEST_RETAIN(gnustepSystemRoot);
+      TEST_RETAIN(gnustepNetworkRoot);
+      TEST_RETAIN(gnustepLocalRoot);
+      TEST_RETAIN(gnustepUserRoot);
+
+      TEST_RETAIN(gnustepRcFileName);
+      TEST_RETAIN(gnustepDefaultsPath);
+      TEST_RETAIN(gnustepUserPath);
+
+      [gnustep_global_lock unlock];
     }
+  NS_HANDLER
+    {
+      /* unlock then re-raise the exception */
+      [gnustep_global_lock unlock];
+      [localException raise];
+    }
+  NS_ENDHANDLER
 }
 
 /*
@@ -608,7 +610,9 @@ GSReadStepConfFile(NSString *fileName)
 	      val = [val stringByTrimmingSpaces];
 
 	      if ([key length] > 0)
-		[dict setObject: val forKey: key];
+		{
+		  [dict setObject: val forKey: key];
+		}
 	    }
 	  else
 	    {