--- a/CharacterArray.st	Sat Feb 07 16:37:16 2015 +0100
+++ b/CharacterArray.st	Sat Feb 07 16:37:53 2015 +0100
@@ -264,7 +264,6 @@
     "
 ! !
 
-
 !CharacterArray class methodsFor:'Signal constants'!
 
 decodingFailedSignal
@@ -1651,7 +1650,6 @@
 ! !
 
 
-
 !CharacterArray methodsFor:'character searching'!
 
 includesMatchCharacters
@@ -7068,7 +7066,7 @@
     state := #initial.
     self do:[:char |
         (state == #initial or:[ state == #gotColon]) ifTrue:[
-            (char isLetter or:[ char == $_ ]) ifFalse:[^ false].
+            (char isLetterOrUnderline) ifFalse:[^ false].
             state := #gotCharacter.
         ] ifFalse:[
             char == $: ifTrue:[
@@ -7156,7 +7154,7 @@
 isUnarySelector
     "Answer true if the receiver contains only chars in an ANSI unary method selector, false otherwise."
 
-    ^ (self first isLetter or:[ self first == $_ ])
+    ^ (self first isLetterOrUnderline)
       and:[ self conform: [ :chr | chr isLetterOrDigit or:[chr == $_] ]]
 
     "Modified: / 13-09-2006 / 11:35:15 / cg"
@@ -7296,11 +7294,11 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.566 2015-02-03 13:32:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.567 2015-02-07 15:37:53 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.566 2015-02-03 13:32:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.567 2015-02-07 15:37:53 cg Exp $'
 ! !