Stop over-engineering tokens.

We aren't for the near future going to have different token store
providers so we should not complicate things right off the bat.