Fix string handling.
Fix tokenizing 'output' tags.