Decorate lams and bvar-uses
Improve unparsed names
Test interaction last
Remove 'fix' unparsing