Rename token to TokenUtils, and move some token-testing functions there
Deferred hints bugfix