Improve AST. Fix CFA to use the new AST. Other stuff.