3028 - support strings in scenarios
3029 - now we can tokenize strings

It seems clearer to keep tokenization together so far, rather than
create a new layer.