--- a/abbrev.stc	Sun Jun 14 22:08:04 2009 +0200
+++ b/abbrev.stc	Mon Jun 15 20:55:05 2009 +0100
@@ -6,61 +6,61 @@
 Behavior Behavior stx:libbasic 'Kernel-Classes' 0
 Boolean Boolean stx:libbasic 'Kernel-Objects' 0
 CharacterEncoder CharacterEncoder stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::BIG5 Encoder_BIG5 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::CNS11643 Encoder_CNS11643 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::CP437 Encoder_CP437 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::GB2313_1980 Encoder_GB2313_1980 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::HANGUL Encoder_HANGUL stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::BIG5 CharacterEncoderImplementations__BIG5 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::CNS11643 CharacterEncoderImplementations__CNS11643 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::CP437 CharacterEncoderImplementations__CP437 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::GB2313_1980 CharacterEncoderImplementations__GB2313_1980 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::HANGUL CharacterEncoderImplementations__HANGUL stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO10646_to_JavaText Encoder_ISO10646_to_JavaText stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO10646_to_SGML Encoder_ISO10646_to_SGML stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO10646_to_UTF16BE Encoder_ISO10646_to_UTF16BE stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO10646_to_UTF16LE Encoder_ISO10646_to_UTF16LE stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_10 Encoder_ISO8859_10 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_11 Encoder_ISO8859_11 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_13 Encoder_ISO8859_13 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_14 Encoder_ISO8859_14 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_16 Encoder_ISO8859_16 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_3 Encoder_ISO8859_3 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_4 Encoder_ISO8859_4 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_6 Encoder_ISO8859_6 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_8 Encoder_ISO8859_8 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_9 Encoder_ISO8859_9 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JIS0201 Encoder_JIS0201 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JIS0208 Encoder_JIS0208 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JIS0208_to_EUC Encoder_JIS0208_to_EUC stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JIS0208_to_JIS7 Encoder_JIS0208_to_JIS7 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JIS0212 Encoder_JIS0212 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JOHAB Encoder_JOHAB stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::KOI7 Encoder_KOI7 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::KOI8_R Encoder_KOI8_R stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::KOI8_U Encoder_KOI8_U stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::KSC5601 Encoder_KSC5601 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Arabic Encoder_MAC_Arabic stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_CentralEuropean Encoder_MAC_CentralEuropean stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Croatian Encoder_MAC_Croatian stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Cyrillic Encoder_MAC_Cyrillic stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Dingbats Encoder_MAC_Dingbats stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Farsi Encoder_MAC_Farsi stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Greek Encoder_MAC_Greek stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Hebrew Encoder_MAC_Hebrew stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Iceland Encoder_MAC_Iceland stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Japanese Encoder_MAC_Japanese stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Korean Encoder_MAC_Korean stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Roman Encoder_MAC_Roman stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Romanian Encoder_MAC_Romanian stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Symbol Encoder_MAC_Symbol stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Thai Encoder_MAC_Thai stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MAC_Turkish Encoder_MAC_Turkish stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Ansi Encoder_MS_Ansi stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Arabic Encoder_MS_Arabic stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Baltic Encoder_MS_Baltic stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Cyrillic Encoder_MS_Cyrillic stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_EastEuropean Encoder_MS_EastEuropean stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Greek Encoder_MS_Greek stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Hebrew Encoder_MS_Hebrew stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Symbol Encoder_MS_Symbol stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Turkish Encoder_MS_Turkish stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::NEXT Encoder_NEXT 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 '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 '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
+CharacterEncoderImplementations::ISO8859_3 CharacterEncoderImplementations__ISO8859_3 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO8859_4 CharacterEncoderImplementations__ISO8859_4 stx:libbasic 'Collections-Text-Encodings' 0
+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 '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
+CharacterEncoderImplementations::JIS0212 CharacterEncoderImplementations__JIS0212 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::JOHAB CharacterEncoderImplementations__JOHAB stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::KOI7 CharacterEncoderImplementations__KOI7 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::KOI8_R CharacterEncoderImplementations__KOI8_R stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::KOI8_U CharacterEncoderImplementations__KOI8_U stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::KSC5601 CharacterEncoderImplementations__KSC5601 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Arabic CharacterEncoderImplementations__MAC_Arabic stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_CentralEuropean CharacterEncoderImplementations__MAC_CentralEuropean stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Croatian CharacterEncoderImplementations__MAC_Croatian stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Cyrillic CharacterEncoderImplementations__MAC_Cyrillic stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Dingbats CharacterEncoderImplementations__MAC_Dingbats stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Farsi CharacterEncoderImplementations__MAC_Farsi stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Greek CharacterEncoderImplementations__MAC_Greek stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Hebrew CharacterEncoderImplementations__MAC_Hebrew stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Iceland CharacterEncoderImplementations__MAC_Iceland stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Japanese CharacterEncoderImplementations__MAC_Japanese stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Korean CharacterEncoderImplementations__MAC_Korean stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Roman CharacterEncoderImplementations__MAC_Roman stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Romanian CharacterEncoderImplementations__MAC_Romanian stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Symbol CharacterEncoderImplementations__MAC_Symbol stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Thai CharacterEncoderImplementations__MAC_Thai stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MAC_Turkish CharacterEncoderImplementations__MAC_Turkish stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Ansi CharacterEncoderImplementations__MS_Ansi stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Arabic CharacterEncoderImplementations__MS_Arabic stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Baltic CharacterEncoderImplementations__MS_Baltic stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Cyrillic CharacterEncoderImplementations__MS_Cyrillic stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_EastEuropean CharacterEncoderImplementations__MS_EastEuropean stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Greek CharacterEncoderImplementations__MS_Greek stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Hebrew CharacterEncoderImplementations__MS_Hebrew stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Symbol CharacterEncoderImplementations__MS_Symbol stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Turkish CharacterEncoderImplementations__MS_Turkish stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::NEXT CharacterEncoderImplementations__NEXT stx:libbasic 'Collections-Text-Encodings' 0
 ClassBuilder ClassBuilder stx:libbasic 'Kernel-Support' 0
 ClassCategoryReader ClassCategoryReader stx:libbasic 'Kernel-Support' 0
 Collection Collection stx:libbasic 'Collections-Abstract' 0
@@ -135,9 +135,9 @@
 BlockContext BlockContext stx:libbasic 'Kernel-Methods' 0
 CachingRegistry CachingRegistry stx:libbasic 'System-Support' 0
 Character Character stx:libbasic 'Magnitude-General' 0
-CharacterEncoderImplementations::ISO10646_1 Encoder_ISO10646_1 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::SingleByteEncoder Encoder_SingleByteEncoder stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::TwoByteEncoder Encoder_TwoByteEncoder stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO10646_1 CharacterEncoderImplementations__ISO10646_1 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::SingleByteEncoder CharacterEncoderImplementations__SingleByteEncoder stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::TwoByteEncoder CharacterEncoderImplementations__TwoByteEncoder stx:libbasic 'Collections-Text-Encodings' 0
 CompiledCode CompiledCode stx:libbasic 'Kernel-Methods' 0
 ControlInterrupt ControlInterrupt stx:libbasic 'Kernel-Exceptions-Control' 1
 Date Date stx:libbasic 'Magnitude-Time' 0
@@ -167,14 +167,14 @@
 ArrayedCollection ArrayedCollection stx:libbasic 'Collections-Abstract' 0
 Association Association stx:libbasic 'Collections-Support' 0
 Block Block stx:libbasic 'Kernel-Methods' 0
-CharacterEncoderImplementations::ASCII Encoder_ASCII stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO10646_to_UTF8 Encoder_ISO10646_to_UTF8 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_1 Encoder_ISO8859_1 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_2 Encoder_ISO8859_2 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_5 Encoder_ISO8859_5 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_7 Encoder_ISO8859_7 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::ISO8859_15 Encoder_ISO8859_15 stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::JIS0208_to_SJIS Encoder_SJIS stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ASCII CharacterEncoderImplementations__ASCII stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO10646_to_UTF8 CharacterEncoderImplementations__ISO10646_to_UTF8 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO8859_1 CharacterEncoderImplementations__ISO8859_1 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO8859_2 CharacterEncoderImplementations__ISO8859_2 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO8859_5 CharacterEncoderImplementations__ISO8859_5 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO8859_7 CharacterEncoderImplementations__ISO8859_7 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO8859_15 CharacterEncoderImplementations__ISO8859_15 stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::JIS0208_to_SJIS CharacterEncoderImplementations__JIS0208_to_SJIS stx:libbasic 'Collections-Text-Encodings' 0
 ClassDescription ClassDescription stx:libbasic 'Kernel-Classes' 0
 ControlRequest ControlRequest stx:libbasic 'Kernel-Exceptions-Control' 1
 Dictionary Dictionary stx:libbasic 'Collections-Unordered' 0