cleanup, fix test case
started work on enriching idents
Cleanup, commenting, trivial renaming
working on adding syntax contexts to identifiers
commenting
more info on overly deep expansion