
        Fix some calc parsing panics

f2045bd