--- a/Smalltalk.st	Fri May 08 01:58:03 2015 +0200
+++ b/Smalltalk.st	Fri May 08 02:02:19 2015 +0200
@@ -20,15 +20,16 @@
 	classVariableNames:'StartBlocks ImageStartBlocks ExitBlocks CachedClasses
 		NumberOfClassesHint SystemPath StartupClass StartupSelector
 		StartupArguments CommandLine CommandName CommandLineArguments
-		CachedAbbreviations VerboseLoading SilentLoading Initializing
-		StandAlone HeadlessOperation IsPlugin IsSharedLibraryComponent
-		IsSTScript DebuggingStandAlone LogDoits LoadBinaries
-		RealSystemPath ResourcePath SourcePath BinaryPath FileInPath
-		PackagePath BinaryDirName ResourceDirName SourceDirName
-		BitmapDirName PackageDirName FileInDirName ChangeFileName
-		ImageStartTime ImageRestartTime DemoMode SaveEmergencyImage
-		SpecialObjectArray CallbackSignal ClassesFailedToInitialize
-		HasNoConsole IgnoreHalt PackageToPathMapping IgnoreAssertions'
+		CachedAbbreviations VerboseStartup VerboseLoading SilentLoading
+		Initializing StandAlone HeadlessOperation IsPlugin
+		IsSharedLibraryComponent IsSTScript DebuggingStandAlone LogDoits
+		LoadBinaries RealSystemPath ResourcePath SourcePath BinaryPath
+		FileInPath PackagePath BinaryDirName ResourceDirName
+		SourceDirName BitmapDirName PackageDirName FileInDirName
+		ChangeFileName ImageStartTime ImageRestartTime DemoMode
+		SaveEmergencyImage SpecialObjectArray CallbackSignal
+		ClassesFailedToInitialize HasNoConsole IgnoreHalt
+		PackageToPathMapping IgnoreAssertions'
 	poolDictionaries:''
 	category:'System-Support'
 !
@@ -622,8 +623,25 @@
     CommandLineArguments := CommandLineArguments asOrderedCollection.
     CommandName := CommandLineArguments removeFirst. "/ the command
 
-    SilentLoading := (CommandLineArguments includes:'--silentStartup').
-    VerboseLoading := (CommandLineArguments includes:'--verboseLoading').
+    (idx := CommandLineArguments indexOf:'--silentStartup') ~~ 0 ifTrue:[
+        SilentLoading := true.
+        CommandLineArguments removeIndex:idx
+    ] ifFalse:[
+        SilentLoading := false.
+    ].        
+    (idx := CommandLineArguments indexOf:'--verboseLoading') ~~ 0 ifTrue:[
+        VerboseLoading := true.
+        CommandLineArguments removeIndex:idx
+    ] ifFalse:[
+        VerboseLoading := false.
+    ].        
+    (idx := CommandLineArguments indexOf:'--verboseStartup') ~~ 0 ifTrue:[
+        VerboseLoading := true.
+        VerboseStartup := true.
+        CommandLineArguments removeIndex:idx
+    ] ifFalse:[
+        VerboseStartup := false.
+    ].        
 
     DebuggingStandAlone := false.
 
@@ -8221,11 +8239,11 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1126 2015-05-07 23:58:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1127 2015-05-08 00:02:19 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1126 2015-05-07 23:58:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1127 2015-05-08 00:02:19 cg Exp $'
 !
 
 version_SVN