--- a/compiler/PPCTrimmingTokenNode.st	Wed Nov 05 21:40:01 2014 +0000
+++ b/compiler/PPCTrimmingTokenNode.st	Wed Nov 05 23:05:19 2014 +0000
@@ -69,7 +69,7 @@
 
 whitespace: anObject
 	(anObject name isNil and: [ self child name isNotNil ]) ifTrue: [ 
-		anObject name: self child name, '_water'.
+		anObject name: self child name, '_ws'.
 	].
 	children at: 1 put: anObject
 ! !
@@ -100,20 +100,19 @@
 !PPCTrimmingTokenNode methodsFor:'as yet unclassified'!
 
 compileWith: compiler effect: effect id: id
-	|  guardSetId guardSet |
+	|  guard |
 
 	compiler startMethod: id.
-	compiler startTokenMode.
 	compiler addVariable: 'start'.
 	compiler addVariable: 'end'.
 	
 	self compileWhitespace: compiler.
 
-	(compiler guards and: [ (guardSet := compiler guardCharSet: self) isNil not ]) ifTrue: [ 	
-		guardSetId := id, '_guard'.
-		compiler addConstant: guardSet as: guardSetId.
+	(compiler guards and: [(guard := PPCGuard on: self) makesSense]) ifTrue: [ 
 		compiler add: 'context atEnd ifTrue: [ ^ self error ].'.
-		compiler add: '(', guardSetId, ' value: context peek) ifFalse: [ ^ self error ].'.
+		guard id: id, '_guard'.
+		guard compileGuard: compiler.
+		compiler addOnLine: 'ifFalse: [ ^ self error ].'
 	].
 
 	compiler add: 'start := context position + 1.'.
@@ -127,7 +126,6 @@
 																start: start  
 																stop: end
 																value: nil'.
-	compiler stopTokenMode.
  ^ compiler stopMethod.	
 !