Tokens::get*TokenOfKind* - change interface