fixed AST CodeStatements and Expression handling