Fix unguaranteed sequencing in calc evaluator