Remove explicit EOF token from token builder (#1276)

Remove explicit EOF token from token builder (#1276) #1986