smooth some rough edges of token parsers