More work on improving the token management in TokenUtils