Token handle rework

I renamed TokenHandle to StoredGrant..

@brockallen do you want to double check?