More AST statement work