
        Simplify the calc AST simplification code

63d0429