cleanup: for tokens, consistently use Eof not eof or EOF