AST: Rewrite using standard approach