slight simplification of AST and progress on LFG