
        Simplify the calc AST simplification code

c3fca86