rubify the EOF token handling