ResolveTokens : token values that contains tokens

ResolveTokens now supports token values that contains tokens.  The
procedure is still slow.