amend: remove token_t from ext interface