Make TokenTree::match propagate matches upwards
Add string position tracking to TokenTree