--- a/abbrev.stc	Mon Apr 12 08:29:17 2010 +0100
+++ b/abbrev.stc	Mon Apr 26 19:26:38 2010 +0100
@@ -1,8 +1,8 @@
 Autoload Autoload stx:libbasic 'Kernel-Classes' 0
-CmdLineParserTest CmdLineParserTest stx:libbasic  'unknownCategory'  0
+CmdLineParserTest CmdLineParserTest stx:libbasic 'System-Support-Command line' 4
 Object Object stx:libbasic 'Kernel-Objects' 0
 ProtoObject ProtoObject stx:libbasic 'Kernel-Objects' 0
-AbstractDesktop AbstractDesktop stx:libbasic  'unknownCategory'  0
+AbstractDesktop AbstractDesktop stx:libbasic 'System-Desktop' 0
 AbstractOperatingSystem AbstractOperatingSystem stx:libbasic 'System-Support' 0
 AbstractSourceFileReader AbstractSourceFileReader stx:libbasic 'Kernel-Classes' 0
 BadRomanNumberFormatError BadRomanNumberFormatError stx:libbasic 'Magnitude-Numbers' 1
@@ -16,10 +16,10 @@
 CharacterEncoderImplementations::HANGUL CharacterEncoderImplementations__HANGUL stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO10646_to_JavaText CharacterEncoderImplementations__ISO10646_to_JavaText stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO10646_to_SGML CharacterEncoderImplementations__ISO10646_to_SGML stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO10646_to_UTF16BE CharacterEncoderImplementations__ISO10646_to_UTF16BE stx:libbasic '* as yet unknown category *' 0
-CharacterEncoderImplementations::ISO10646_to_UTF16LE CharacterEncoderImplementations__ISO10646_to_UTF16LE stx:libbasic '* as yet unknown category *' 0
+CharacterEncoderImplementations::ISO10646_to_UTF16BE CharacterEncoderImplementations__ISO10646_to_UTF16BE stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO10646_to_UTF16LE CharacterEncoderImplementations__ISO10646_to_UTF16LE stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO8859_10 CharacterEncoderImplementations__ISO8859_10 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_11 CharacterEncoderImplementations__ISO8859_11 stx:libbasic '* as yet unknown category *' 0
+CharacterEncoderImplementations::ISO8859_11 CharacterEncoderImplementations__ISO8859_11 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO8859_13 CharacterEncoderImplementations__ISO8859_13 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO8859_14 CharacterEncoderImplementations__ISO8859_14 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO8859_16 CharacterEncoderImplementations__ISO8859_16 stx:libbasic 'Collections-Text-Encodings' 0
@@ -28,7 +28,7 @@
 CharacterEncoderImplementations::ISO8859_6 CharacterEncoderImplementations__ISO8859_6 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO8859_8 CharacterEncoderImplementations__ISO8859_8 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO8859_9 CharacterEncoderImplementations__ISO8859_9 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JIS0201 CharacterEncoderImplementations__JIS0201 stx:libbasic '* as yet unknown category *' 0
+CharacterEncoderImplementations::JIS0201 CharacterEncoderImplementations__JIS0201 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0208 CharacterEncoderImplementations__JIS0208 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0208_to_EUC CharacterEncoderImplementations__JIS0208_to_EUC stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0208_to_JIS7 CharacterEncoderImplementations__JIS0208_to_JIS7 stx:libbasic 'Collections-Text-Encodings' 0
@@ -62,8 +62,8 @@
 CharacterEncoderImplementations::NEXT CharacterEncoderImplementations__NEXT stx:libbasic 'Collections-Text-Encodings' 0
 ClassBuilder ClassBuilder stx:libbasic 'Kernel-Support' 0
 ClassCategoryReader ClassCategoryReader stx:libbasic 'Kernel-Support' 0
-CmdLineOption CmdLineOption stx:libbasic  'unknownCategory'  0
-CmdLineParser CmdLineParser stx:libbasic  'unknownCategory'  0
+CmdLineOption CmdLineOption stx:libbasic 'System-Support-Command line' 0
+CmdLineParser CmdLineParser stx:libbasic 'System-Support-Command line' 0
 Collection Collection stx:libbasic 'Collections-Abstract' 0
 Context Context stx:libbasic 'Kernel-Methods' 0
 Continuation Continuation stx:libbasic 'Kernel-Processes' 0
@@ -84,11 +84,11 @@
 Magnitude Magnitude stx:libbasic 'Magnitude-General' 0
 MappedExternalBytes MappedExternalBytes stx:libbasic 'System-Support' 0
 Message Message stx:libbasic 'Kernel-Methods' 0
-MethodOverridesTest MethodOverridesTest stx:libbasic 'Kernel-Tests' 2
+MethodOverridesTest MethodOverridesTest stx:libbasic 'Kernel-Tests' 4
 MetaNumber MetaNumber stx:libbasic 'Magnitude-Numbers' 0
 MiniDebugger MiniDebugger stx:libbasic 'System-Debugging-Support' 0
 MiniInspector MiniInspector stx:libbasic 'System-Debugging-Support' 0
-NaiveRomanNumberFormatNotification NaiveRomanNumberFormatNotification stx:libbasic 'Magnitude-Numbers' 1
+NaiveRomanNumberFormatNotification NaiveRomanNumberFormatNotification stx:libbasic 'Magnitude-Numbers' 0
 NameSpace NameSpace stx:libbasic 'Kernel-Classes' 0
 NotANumber NotANumber stx:libbasic 'Magnitude-Numbers' 0
 NumberConversionError NumberConversionError stx:libbasic 'Magnitude-Numbers' 1
@@ -120,9 +120,9 @@
 TextCollectorStream TextCollectorStream stx:libbasic 'Streams-Misc' 0
 UnboundedExternalStream UnboundedExternalStream stx:libbasic 'Streams-External' 0
 UndefinedObject UndefinedObject stx:libbasic 'Kernel-Objects' 0
-UnixFileDescriptorHandle UnixFileDescriptorHandle stx:libbasic  'unknownCategory'  0
-UnixFileHandle UnixFileHandle stx:libbasic  'unknownCategory'  0
-UnixOperatingSystem UnixOperatingSystem stx:libbasic  'unknownCategory'  0
+UnixFileDescriptorHandle UnixFileDescriptorHandle stx:libbasic 'OS-Unix' 0
+UnixFileHandle UnixFileHandle stx:libbasic 'OS-Unix' 0
+UnixOperatingSystem UnixOperatingSystem stx:libbasic 'OS-Unix' 0
 UserMessage UserMessage stx:libbasic 'Interface-Internationalization' 0
 Visitor Visitor stx:libbasic 'System-Visiting' 0
 WeakValueIdentityDictionary WeakValueIdentityDictionary stx:libbasic 'Collections-Weak' 0
@@ -163,14 +163,14 @@
 SequenceableCollection SequenceableCollection stx:libbasic 'Collections-Abstract' 0
 Set Set stx:libbasic 'Collections-Unordered' 0
 SmalltalkChunkFileSourceReader SmalltalkChunkFileSourceReader stx:libbasic 'Kernel-Classes' 0
-SmalltalkDesktop SmalltalkDesktop stx:libbasic  'unknownCategory'  0
+SmalltalkDesktop SmalltalkDesktop stx:libbasic 'System-Desktop' 0
 SmalltalkLanguage SmalltalkLanguage stx:libbasic 'Kernel-Languages' 1
 True True stx:libbasic 'Kernel-Objects' 0
-UnixDesktop UnixDesktop stx:libbasic  'unknownCategory'  0
+UnixDesktop UnixDesktop stx:libbasic 'unknownCategory' 0
 UnixFilename UnixFilename stx:libbasic 'OS-Unix' 0
 UserNotification UserNotification stx:libbasic 'Kernel-Exceptions-Notifications' 1
 WeakInterestConverter WeakInterestConverter stx:libbasic 'Interface-Support-Models' 0
-WindowsDesktop WindowsDesktop stx:libbasic  'unknownCategory'  0
+WindowsDesktop WindowsDesktop stx:libbasic 'System-Desktop' 0
 ActivityNotification ActivityNotification stx:libbasic 'Kernel-Exceptions-Notifications' 1
 ArrayedCollection ArrayedCollection stx:libbasic 'Collections-Abstract' 0
 Association Association stx:libbasic 'Collections-Support' 0
@@ -233,7 +233,7 @@
 ElementBoundsError ElementBoundsError stx:libbasic 'Kernel-Exceptions-Errors' 1
 FloatArray FloatArray stx:libbasic 'Collections-Arrayed' 0
 Fraction Fraction stx:libbasic 'Magnitude-Numbers' 0
-GNOMEDesktop GNOMEDesktop stx:libbasic  'unknownCategory'  0
+GNOMEDesktop GNOMEDesktop stx:libbasic 'System-Desktop' 0
 IdentityDictionary IdentityDictionary stx:libbasic 'Collections-Unordered' 0
 InlineObjectClassDescription InlineObjectClassDescription stx:libbasic 'Programming-Support' 0
 Integer Integer stx:libbasic 'Magnitude-Numbers' 0
@@ -370,4 +370,5 @@
 ImmutableString ImmutableString stx:libbasic 'System-Compiler-Support' 0
 SandboxedMethod SandboxedMethod stx:libbasic 'Kernel-Methods' 0
 PrototypeLookupAlgorithm PrototypeLookupAlgorithm stx:libbasic 'Kernel-Classes' 0
-
+Lookup Lookup stx:libbasic 'Kernel-Classes' 0
+BuiltinLookup BuiltinLookup stx:libbasic 'Kernel-Classes' 0