Simplify SimpleTokenResolver
Merge pull request #2452 from jakub-/simple-token-resolver

Simplify SimpleTokenResolver