--- a/compiler/PPCTokenizingCodeGen.st	Tue Aug 18 22:46:10 2015 +0100
+++ b/compiler/PPCTokenizingCodeGen.st	Mon Aug 24 15:56:20 2015 +0100
@@ -12,50 +12,29 @@
 
 !PPCTokenizingCodeGen methodsFor:'code generation'!
 
-codeClearError
-    errorStrategy codeClearError
-!
-
-codeError
-    errorStrategy codeError
-!
-
-codeError: message
-    errorStrategy codeError: message.
-!
-
-smartRemember: parser to: variableName 
-    rememberStrategy smartRemember: parser to: variableName
+codeScannerRememberTo: variableName 
+    self codeAssign: 'scanner remember' to: variableName.
+    self codeDot.
 !
 
-smartRestore: parser from: mementoName
-    rememberStrategy smartRestore: parser from: mementoName
-! !
-
-!PPCTokenizingCodeGen methodsFor:'hooks'!
-
-errorStrategy
-    ^ errorStrategy ifNil: [ PPCCompilerTokenizingErrorStrategy on: self  ]
+codeScannerRestoreFrom: variableName 
+    self code: 'scanner restore: ', variableName.
+    self codeDot.
+                    
 !
 
-errorStrategy: whatever
-    errorStrategy := whatever 
+remember: node to: variableName 
+    ^ self codeScannerRememberTo: variableName
 !
 
-rememberStrategy
-    ^ rememberStrategy ifNil: [ PPCCompilerTokenizingRememberStrategy on: self  ]
-!
-
-rememberStrategy: whatever
-    rememberStrategy := whatever 
+restore: node from: mementoName
+    ^ self codeScannerRestoreFrom: mementoName
 ! !
 
 !PPCTokenizingCodeGen methodsFor:'initialization'!
 
 initialize
     super initialize.
-    rememberStrategy := PPCCompilerTokenizingRememberStrategy on: self.
-    errorStrategy := PPCCompilerTokenizingErrorStrategy on: self.
 ! !
 
 !PPCTokenizingCodeGen class methodsFor:'documentation'!