Migrate to the new AST repr for ->