next_token now returns a T instead of remove_cv<T>