New AST refactoring cases