
        Simplify the calc AST simplification code

b183df4