next_token now works even with const types