Improve use of subvarVisitor and clear stateful contexts after each def visit.
Massive clean up of old unused FIXME and unneeded annotations.