EOF now gets added to token stream