--- a/PPAndParser.st	Fri Oct 03 01:59:10 2014 +0100
+++ b/PPAndParser.st	Fri Oct 03 02:33:08 2014 +0100
@@ -16,11 +16,11 @@
 
 !PPAndParser methodsFor:'parsing'!
 
-parseOn: aStream
-	| element position |
-	position := aStream position.
-	element := parser parseOn: aStream.
-	aStream position: position.
+parseOn: aPPContext
+	| element memento |
+	memento := aPPContext remember.
+	element := parser parseOn: aPPContext.
+	aPPContext restore: memento.
 	^ element
 ! !