More fixes to the new AST code.