--- a/compiler/PPTokenizingCompiledParser.st	Tue May 12 01:24:03 2015 +0100
+++ b/compiler/PPTokenizingCompiledParser.st	Thu May 21 14:12:22 2015 +0100
@@ -12,15 +12,12 @@
 !PPTokenizingCompiledParser methodsFor:'tokenizing'!
 
 consume: tokenType
-    (self currentTokenTypeIs: tokenType) ifTrue: [ 
-        | retval |
-        retval := currentTokenValue.
+    (self perform: tokenType) ifTrue: [ 
         currentTokenType := nil.
-        ^ retval
-    ] ifFalse: [ 
-        "self error: 'expected: ', tokenType storeString, ' got ', currentTokenType storeString."
-        self error.
-    ]
+        ^ currentTokenValue.
+    ].	
+    "self error: 'expected: ', tokenType storeString, ' got ', currentTokenType storeString."
+    self error.
 !
 
 consumeWhitespace
@@ -34,14 +31,11 @@
 
 currentTokenTypeIs: tokenType
     "if the type is read"
+    self halt: 'deprecated'.
     currentTokenType isNil ifFalse: [ ^ currentTokenType = tokenType ].
     
     "if not, try to read the token"
-    self perform: tokenType.
-    error ifTrue: [  
-        ^ error := false.
-    ].
-    ^ true
+    ^ self perform: tokenType.
 !
 
 currentTokenValue
@@ -65,7 +59,7 @@
 
     self consumeWhitespace.
     retval := self perform: startSymbol.
-    self consumeWhitespace.
+"	self consumeWhitespace."
 
     (retval isPetitFailure) ifTrue: [ aPPContext noteFailure: failure ].
     error ifTrue: [ aPPContext noteFailure: failure. retval := failure ].