:memo: Use TomDoc
Resolve scope names in captures

Previously these were unresolved so any $2 style markers were not
converted.
1.5.1