Revert unwrap, it's too fragile
Use XML to find definitions
Don't parse definitions in grammar at all
Merge branch 'defns_from_xml'