Use new style tokens.